aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev/vagrant/Vagrantfile2
-rw-r--r--dev/vagrant/ubuntu-bootstrap.sh3
2 files changed, 3 insertions, 2 deletions
diff --git a/dev/vagrant/Vagrantfile b/dev/vagrant/Vagrantfile
index 04393958b..fbfe05770 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 aed1b766b..966a07a77 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)"