openstack/kolla-ansible
Code Issues Proposed changes

Merge "Harmonise vagrant provider defaults"

Browse Source
This commit is contained in:
Jenkins 2016-02-22 18:00:02 +00:00 committed by Gerrit Code Review
commit 1d132993fd
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dev/vagrant/Vagrantfile vendored
View File

@ -34,7 +34,7 @@ PROVIDER_DEFAULTS ||= {
centos: { centos: {
base_image: "puppetlabs/centos-7.0-64-puppet", base_image: "puppetlabs/centos-7.0-64-puppet",
bridge_interface: "wlp3s0b1", bridge_interface: "wlp3s0b1",
vagrant_shared_folder: "/vagrant", vagrant_shared_folder: "/home/vagrant/sync",
sync_method: "virtualbox", sync_method: "virtualbox",
provision_script: "centos-bootstrap.sh", provision_script: "centos-bootstrap.sh",
kolla_path: "/home/vagrant/kolla" kolla_path: "/home/vagrant/kolla"
@ -43,9 +43,9 @@ PROVIDER_DEFAULTS ||= {
base_image: "ubuntu/wily64", base_image: "ubuntu/wily64",
bridge_interface: "wlp3s0b1", bridge_interface: "wlp3s0b1",
vagrant_shared_folder: "/home/vagrant/sync", vagrant_shared_folder: "/home/vagrant/sync",
sync_method: "nfs", sync_method: "virtualbox",
provision_script: "ubuntu-bootstrap.sh", provision_script: "ubuntu-bootstrap.sh",
kolla_path: "/usr/local/kolla" kolla_path: "/home/vagrant/kolla"
} }
} }
} }

10
dev/vagrant/Vagrantfile.custom.example
View File

@ -19,7 +19,7 @@
# bridge_interface: "virbr0", # bridge_interface: "virbr0",
# vagrant_shared_folder: "/home/vagrant/sync", # vagrant_shared_folder: "/home/vagrant/sync",
# sync_method: "nfs", # sync_method: "nfs",
# provision_script: "bootstrap.sh", # provision_script: "centos-bootstrap.sh",
# kolla_path: "/home/vagrant/kolla" # kolla_path: "/home/vagrant/kolla"
# } # }
# }, # },
@ -27,18 +27,18 @@
# centos: { # centos: {
# base_image: "puppetlabs/centos-7.0-64-puppet", # base_image: "puppetlabs/centos-7.0-64-puppet",
# bridge_interface: "wlp3s0b1", # bridge_interface: "wlp3s0b1",
# vagrant_shared_folder: "/vagrant", # vagrant_shared_folder: "/home/vagrant/sync",
# sync_method: "virtualbox", # sync_method: "virtualbox",
# provision_script: "bootstrap.sh", # provision_script: "centos-bootstrap.sh",
# kolla_path: "/home/vagrant/kolla" # kolla_path: "/home/vagrant/kolla"
# }, # },
# ubuntu: { # ubuntu: {
# base_image: "ubuntu/wily64", # base_image: "ubuntu/wily64",
# bridge_interface: "wlp3s0b1", # bridge_interface: "wlp3s0b1",
# vagrant_shared_folder: "/home/vagrant/sync", # vagrant_shared_folder: "/home/vagrant/sync",
# sync_method: "nfs", # sync_method: "virtualbox",
# provision_script: "ubuntu-bootstrap.sh", # provision_script: "ubuntu-bootstrap.sh",
# kolla_path: "/usr/local/kolla" # kolla_path: "/home/vagrant/kolla"
# } # }
# } # }
# } # }