Skip to content
Snippets Groups Projects
Commit d2b388d5 authored by Diogo Monteiro's avatar Diogo Monteiro
Browse files

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
parent 55e4b54e
No related branches found
No related tags found
No related merge requests found
...@@ -136,7 +136,7 @@ Vagrant.configure(2) do |config| ...@@ -136,7 +136,7 @@ Vagrant.configure(2) do |config|
# The operator controls the deployment # The operator controls the deployment
config.vm.define "operator" do |admin| config.vm.define "operator" do |admin|
admin.vm.hostname = "operator.local" 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 "../../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 "../..", 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) admin.vm.synced_folder "storage/operator/", "/data/host", create:"True", type: get_default(:sync_method)
......
#!/bin/bash #!/bin/bash
kolla_path=$3
registry=operator.local registry=operator.local
registry_port=4000 registry_port=4000
...@@ -57,7 +58,7 @@ create_registry() { ...@@ -57,7 +58,7 @@ create_registry() {
configure_kolla() { configure_kolla() {
echo "Configuring Kolla" echo "Configuring Kolla"
pip install -r /home/vagrant/kolla/requirements.txt pip install -r $kolla_path/requirements.txt
} }
echo "Kernel version $(uname -r)" echo "Kernel version $(uname -r)"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment