diff options
| author | Daniel Gonzalez <daniel@gonzalez-nothnagel.de> | 2016-03-05 02:01:13 +0100 |
|---|---|---|
| committer | Daniel Gonzalez <daniel@gonzalez-nothnagel.de> | 2016-03-15 04:16:49 +0100 |
| commit | 5960900f9a13678d895515f2c8492ce511b6d7de (patch) | |
| tree | 1a0d939952ee6f075774df1571caa699202c309b /dev/vagrant/Vagrantfile.custom.example | |
| parent | ba6ea72a3737716e709e69d7224edc03b7c3f853 (diff) | |
| download | kolla-5960900f9a13678d895515f2c8492ce511b6d7de.tar.gz kolla-5960900f9a13678d895515f2c8492ce511b6d7de.zip | |
Unify vagrant bootstrap.sh scripts
Merge the vagrant bootstrap scripts for centos and ubuntu into a single
file.
Change-Id: Ia07931b4717cd393fe51141907fc561166cc05e4
Closes-Bug: 1554140
Diffstat (limited to 'dev/vagrant/Vagrantfile.custom.example')
| -rw-r--r-- | dev/vagrant/Vagrantfile.custom.example | 8 |
1 files changed, 5 insertions, 3 deletions
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" # } # } |