From d2b388d55c3352c5d864824862f1914b2213edef Mon Sep 17 00:00:00 2001
From: Diogo Monteiro <diogo.gmt@gmail.com>
Date: Thu, 12 Nov 2015 08:55:57 -0500
Subject: [PATCH] Get kolla path from settings when provisioning box

The path for the kolla source dir was being
hardcoded on the ubuntu-bootstrap provision script
instead of utilizing the path defined in the
PROVIDER_DEFAULTS settings in the Vagrantfile

Change-Id: I0eb752ecf4db580838687c290ccf36810e8a4ff3
---
 dev/vagrant/Vagrantfile         | 2 +-
 dev/vagrant/ubuntu-bootstrap.sh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev/vagrant/Vagrantfile b/dev/vagrant/Vagrantfile
index 04393958bb..fbfe057708 100644
--- a/dev/vagrant/Vagrantfile
+++ b/dev/vagrant/Vagrantfile
@@ -136,7 +136,7 @@ Vagrant.configure(2) do |config|
   # The operator controls the deployment
   config.vm.define "operator" do |admin|
     admin.vm.hostname = "operator.local"
-    admin.vm.provision :shell, path: get_default(:provision_script), args: "operator #{MULTINODE ? 'multinode' : 'aio'}"
+    admin.vm.provision :shell, path: get_default(:provision_script), args: "operator #{MULTINODE ? 'multinode' : 'aio'} #{get_default(:kolla_path)}"
     admin.vm.synced_folder "../../etc/kolla", "/etc/kolla", type: "nfs"
     admin.vm.synced_folder "../..", get_default(:kolla_path), create:"True", type: get_default(:sync_method)
     admin.vm.synced_folder "storage/operator/", "/data/host", create:"True", type: get_default(:sync_method)
diff --git a/dev/vagrant/ubuntu-bootstrap.sh b/dev/vagrant/ubuntu-bootstrap.sh
index aed1b766b9..966a07a77f 100644
--- a/dev/vagrant/ubuntu-bootstrap.sh
+++ b/dev/vagrant/ubuntu-bootstrap.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+kolla_path=$3
 registry=operator.local
 registry_port=4000
 
@@ -57,7 +58,7 @@ create_registry() {
 
 configure_kolla() {
     echo "Configuring Kolla"
-    pip install -r /home/vagrant/kolla/requirements.txt
+    pip install -r $kolla_path/requirements.txt
 }
 
 echo "Kernel version $(uname -r)"