From 5960900f9a13678d895515f2c8492ce511b6d7de Mon Sep 17 00:00:00 2001 From: Daniel Gonzalez Date: Sat, 5 Mar 2016 02:01:13 +0100 Subject: Unify vagrant bootstrap.sh scripts Merge the vagrant bootstrap scripts for centos and ubuntu into a single file. Change-Id: Ia07931b4717cd393fe51141907fc561166cc05e4 Closes-Bug: 1554140 --- dev/vagrant/Vagrantfile.custom.example | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'dev/vagrant/Vagrantfile.custom.example') diff --git a/dev/vagrant/Vagrantfile.custom.example b/dev/vagrant/Vagrantfile.custom.example index bb82f041a..0ca315f27 100644 --- a/dev/vagrant/Vagrantfile.custom.example +++ b/dev/vagrant/Vagrantfile.custom.example @@ -16,6 +16,11 @@ # 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: { @@ -23,7 +28,6 @@ # bridge_interface: "virbr0", # vagrant_shared_folder: "/home/vagrant/sync", # sync_method: "nfs", -# provision_script: "centos-bootstrap.sh", # kolla_path: "/home/vagrant/kolla" # } # }, @@ -33,7 +37,6 @@ # bridge_interface: "wlp3s0b1", # vagrant_shared_folder: "/home/vagrant/sync", # sync_method: "virtualbox", -# provision_script: "centos-bootstrap.sh", # kolla_path: "/home/vagrant/kolla" # }, # ubuntu: { @@ -41,7 +44,6 @@ # bridge_interface: "wlp3s0b1", # vagrant_shared_folder: "/home/vagrant/sync", # sync_method: "virtualbox", -# provision_script: "ubuntu-bootstrap.sh", # kolla_path: "/home/vagrant/kolla" # } # } -- cgit v1.2.3