diff options
| author | Daniel Gonzalez <daniel@gonzalez-nothnagel.de> | 2016-02-19 22:15:56 +0100 |
|---|---|---|
| committer | Daniel Gonzalez <daniel@gonzalez-nothnagel.de> | 2016-02-22 14:15:20 +0100 |
| commit | 1665f5007d82fd458119e94b29ad7f2e58288895 (patch) | |
| tree | ed4c083c8d5e364dd87bfacf1f9d07157438fbe0 /dev | |
| parent | e970d8b5bf2e774f8fd90278cebca032d93ceceb (diff) | |
| download | kolla-1665f5007d82fd458119e94b29ad7f2e58288895.tar.gz kolla-1665f5007d82fd458119e94b29ad7f2e58288895.zip | |
Harmonise vagrant provider defaults
Ensure that provider defaults of libvirt and virtualbox use the same
paths and provisioning scripts.
Change-Id: Ie968b118aa0540204751c348ef3408a6fe24d32a
Partial-Bug: #1547114
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/vagrant/Vagrantfile | 6 | ||||
| -rw-r--r-- | dev/vagrant/Vagrantfile.custom.example | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/dev/vagrant/Vagrantfile b/dev/vagrant/Vagrantfile index af29a8dbe..35d738594 100644 --- a/dev/vagrant/Vagrantfile +++ b/dev/vagrant/Vagrantfile @@ -34,7 +34,7 @@ PROVIDER_DEFAULTS ||= { centos: { base_image: "puppetlabs/centos-7.0-64-puppet", bridge_interface: "wlp3s0b1", - vagrant_shared_folder: "/vagrant", + vagrant_shared_folder: "/home/vagrant/sync", sync_method: "virtualbox", provision_script: "centos-bootstrap.sh", kolla_path: "/home/vagrant/kolla" @@ -43,9 +43,9 @@ PROVIDER_DEFAULTS ||= { base_image: "ubuntu/wily64", bridge_interface: "wlp3s0b1", vagrant_shared_folder: "/home/vagrant/sync", - sync_method: "nfs", + sync_method: "virtualbox", provision_script: "ubuntu-bootstrap.sh", - kolla_path: "/usr/local/kolla" + kolla_path: "/home/vagrant/kolla" } } } diff --git a/dev/vagrant/Vagrantfile.custom.example b/dev/vagrant/Vagrantfile.custom.example index 60046d156..f56310fce 100644 --- a/dev/vagrant/Vagrantfile.custom.example +++ b/dev/vagrant/Vagrantfile.custom.example @@ -19,7 +19,7 @@ # bridge_interface: "virbr0", # vagrant_shared_folder: "/home/vagrant/sync", # sync_method: "nfs", -# provision_script: "bootstrap.sh", +# provision_script: "centos-bootstrap.sh", # kolla_path: "/home/vagrant/kolla" # } # }, @@ -27,18 +27,18 @@ # centos: { # base_image: "puppetlabs/centos-7.0-64-puppet", # bridge_interface: "wlp3s0b1", -# vagrant_shared_folder: "/vagrant", +# vagrant_shared_folder: "/home/vagrant/sync", # sync_method: "virtualbox", -# provision_script: "bootstrap.sh", +# provision_script: "centos-bootstrap.sh", # kolla_path: "/home/vagrant/kolla" # }, # ubuntu: { # base_image: "ubuntu/wily64", # bridge_interface: "wlp3s0b1", # vagrant_shared_folder: "/home/vagrant/sync", -# sync_method: "nfs", +# sync_method: "virtualbox", # provision_script: "ubuntu-bootstrap.sh", -# kolla_path: "/usr/local/kolla" +# kolla_path: "/home/vagrant/kolla" # } # } # } |