diff options
| author | Martin André <m.andre@redhat.com> | 2015-09-14 22:33:15 +0900 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2015-09-15 14:59:22 +0900 |
| commit | 1228cc8365b64163cb2f307603fe436bcbf0c900 (patch) | |
| tree | c762af7cf129a17d35cdb7d36e8e5fadda88a4a6 | |
| parent | 941aa4935dc3ab621453c5ca44b6783c82dae5b0 (diff) | |
| download | kolla-1228cc8365b64163cb2f307603fe436bcbf0c900.tar.gz kolla-1228cc8365b64163cb2f307603fe436bcbf0c900.zip | |
Reuse kolla working dir from host in operator
Partially-Implements: blueprint vagrant-improvements
Change-Id: I5eca45b497ed1aea3a3706d67c9938390be51f1d
| -rw-r--r-- | vagrant/Vagrantfile | 1 | ||||
| -rw-r--r-- | vagrant/bootstrap.sh | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index c490cb2b0..abcd9d72f 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -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 diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index 17dd57059..cd413527f 100644 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -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 |