diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-15 04:09:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-15 04:09:39 +0000 |
| commit | a42fd0c0d2ca550dba9228bf31d4237ea8d2faf6 (patch) | |
| tree | 1e165f9695d058b48cd1fa58f71171893a65a385 /dev/vagrant/Vagrantfile | |
| parent | 439188cedbae289897d9d392681096928023258d (diff) | |
| parent | 5960900f9a13678d895515f2c8492ce511b6d7de (diff) | |
| download | kolla-a42fd0c0d2ca550dba9228bf31d4237ea8d2faf6.tar.gz kolla-a42fd0c0d2ca550dba9228bf31d4237ea8d2faf6.zip | |
Merge "Unify vagrant bootstrap.sh scripts"
Diffstat (limited to 'dev/vagrant/Vagrantfile')
| -rw-r--r-- | dev/vagrant/Vagrantfile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/dev/vagrant/Vagrantfile b/dev/vagrant/Vagrantfile index 3c1400337..6ade605fb 100644 --- a/dev/vagrant/Vagrantfile +++ b/dev/vagrant/Vagrantfile @@ -23,6 +23,11 @@ DISTRO ||= "centos" # is libvirt. GRAPHICSIP ||= "127.0.0.1" +# The bootstrap.sh provision_script requires CentOS 7 or Ubuntu 15.10. +# Provisioning other boxes than the default ones may therefore +# require changes to bootstrap.sh. +PROVISION_SCRIPT ||= "bootstrap.sh" + PROVIDER_DEFAULTS ||= { libvirt: { centos: { @@ -30,7 +35,6 @@ PROVIDER_DEFAULTS ||= { bridge_interface: "virbr0", vagrant_shared_folder: "/home/vagrant/sync", sync_method: "nfs", - provision_script: "centos-bootstrap.sh", kolla_path: "/home/vagrant/kolla" } }, @@ -40,7 +44,6 @@ PROVIDER_DEFAULTS ||= { bridge_interface: "wlp3s0b1", vagrant_shared_folder: "/home/vagrant/sync", sync_method: "virtualbox", - provision_script: "centos-bootstrap.sh", kolla_path: "/home/vagrant/kolla" }, ubuntu: { @@ -48,7 +51,6 @@ PROVIDER_DEFAULTS ||= { bridge_interface: "wlp3s0b1", vagrant_shared_folder: "/home/vagrant/sync", sync_method: "virtualbox", - provision_script: "ubuntu-bootstrap.sh", kolla_path: "/home/vagrant/kolla" } } @@ -158,7 +160,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'} #{get_default(:kolla_path)}" + admin.vm.provision :shell, path: PROVISION_SCRIPT, args: "operator #{MULTINODE ? 'multinode' : 'aio'} #{get_default(:kolla_path)}" admin.vm.synced_folder File.join(vagrant_dir, '..', '..'), get_default(:kolla_path), create:"True", type: get_default(:sync_method) admin.vm.synced_folder File.join(vagrant_dir, 'storage', 'operator'), "/data/host", create:"True", type: get_default(:sync_method) admin.vm.synced_folder File.join(vagrant_dir, 'storage', 'shared'), "/data/shared", create:"True", type: get_default(:sync_method) @@ -179,7 +181,7 @@ Vagrant.configure(2) do |config| hostname = "#{node_type}0#{i}" config.vm.define hostname do |node| node.vm.hostname = "#{hostname}.local" - node.vm.provision :shell, path: get_default(:provision_script), args: "#{hostname} multinode #{get_default(:kolla_path)}" + node.vm.provision :shell, path: PROVISION_SCRIPT, args: "#{hostname} multinode #{get_default(:kolla_path)}" node.vm.synced_folder File.join(vagrant_dir, 'storage', node_type), "/data/host", create:"True", type: get_default(:sync_method) node.vm.synced_folder File.join(vagrant_dir, 'storage', 'shared'), "/data/shared", create:"True", type: get_default(:sync_method) node.vm.synced_folder ".", get_default(:vagrant_shared_folder), disabled: true |