diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-18 01:05:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-18 01:05:44 +0000 |
| commit | b647535e338c4f38521cd81d861684998edb589f (patch) | |
| tree | 5b4ba71e1c780671c81a50cefca785d0414cbd99 /dev | |
| parent | 48b27ebf8a83b1a4443f59dd69f9f34cb62a4322 (diff) | |
| parent | d2b388d55c3352c5d864824862f1914b2213edef (diff) | |
| download | kolla-b647535e338c4f38521cd81d861684998edb589f.tar.gz kolla-b647535e338c4f38521cd81d861684998edb589f.zip | |
Merge "Get kolla path from settings when provisioning box"
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/vagrant/Vagrantfile | 2 | ||||
| -rw-r--r-- | dev/vagrant/ubuntu-bootstrap.sh | 3 |
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)" |