openstack/kolla-ansible
Code Issues Proposed changes

Reuse kolla working dir from host in operator

Browse Source 
Partially-Implements: blueprint vagrant-improvements
Change-Id: I5eca45b497ed1aea3a3706d67c9938390be51f1d
This commit is contained in:
Martin André 2015-09-14 22:33:15 +09:00
parent 941aa4935d
commit 1228cc8365
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vagrant/Vagrantfile vendored
View File

@ -76,6 +76,7 @@ Vagrant.configure(2) do |config|
config.vm.define "operator" do |admin|
admin.vm.hostname = "operator.local"
admin.vm.provision :shell, path: "bootstrap.sh", args: "operator #{MULTINODE ? 'multinode' : 'aio'}"
admin.vm.synced_folder "..", "/home/vagrant/kolla", create:"True", type: 'nfs'
admin.vm.synced_folder "storage/operator/", "/data/host", create:"True", type: 'nfs'
admin.vm.synced_folder "storage/shared/", "/data/shared", create:"True", type: 'nfs'
admin.vm.synced_folder ".", "/home/vagrant/sync", disabled: true

5
vagrant/bootstrap.sh
View File

@ -66,10 +66,7 @@ function configure_operator {
yum install -y git mariadb && yum clean all
pip install --upgrade ansible python-openstackclient
if [ ! -d ~vagrant/kolla ]; then
su - vagrant sh -c "https_proxy=$https_proxy git clone https://github.com/openstack/kolla.git ~/kolla"
pip install ~vagrant/kolla
fi
pip install ~vagrant/kolla
# Note: this trickery requires a patched docker binary.
if [ "$http_proxy" = "" ]; then