diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-22 18:00:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-22 18:00:02 +0000 |
| commit | 1d132993fddc8d0c0322bff322d7b41a79e4c413 (patch) | |
| tree | 21dd2508b58e0d6eb837b0e8eb8f666cd093bdfc | |
| parent | 1de5b6efa04c42bd674a67f2e01f38d9ebfc4e92 (diff) | |
| parent | 1665f5007d82fd458119e94b29ad7f2e58288895 (diff) | |
| download | kolla-1d132993fddc8d0c0322bff322d7b41a79e4c413.tar.gz kolla-1d132993fddc8d0c0322bff322d7b41a79e4c413.zip | |
Merge "Harmonise vagrant provider defaults"
| -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" # } # } # } |