From 1228cc8365b64163cb2f307603fe436bcbf0c900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Mon, 14 Sep 2015 22:33:15 +0900 Subject: [PATCH] Reuse kolla working dir from host in operator Partially-Implements: blueprint vagrant-improvements Change-Id: I5eca45b497ed1aea3a3706d67c9938390be51f1d --- vagrant/Vagrantfile | 1 + vagrant/bootstrap.sh | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index c490cb2b04..abcd9d72f7 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 17dd570591..cd413527f8 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