openstack
/
devstack-vagrant
Code Issues Proposed changes

make internal interface names configurable from config.yaml 

Change-Id: Ia018f3a71073a7cfdb093096ba313292909f2675
This commit is contained in:
Jim Riordan 2017-06-01 10:00:30 +10:00 committed by j1mr10rd4n
parent 20b2965fd9
commit 323306a8d9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Vagrantfile vendored
View File

@ -69,6 +69,8 @@ def configure_vm(name, vm, conf)
"is_compute" => (name != "manager"),
"use_ldap" => conf["use_ldap"] || false,
"extra_images" => conf["extra_images"] || "",
"guest_interface_default" => conf["guest_interface_default"] || "enp0s8",
"host_ip_iface" => conf["host_ip_iface"] || "enp0s8",
"vagrant_username" => conf["vagrant_username"] || "ubuntu",
}
# add all the rest of the content in the conf file

4
puppet/modules/devstack/templates/local.erb
View File

@ -18,8 +18,8 @@ DATABASE_TYPE=mysql
# networking configuration parameters
GUEST_INTERFACE_DEFAULT=eth1
HOST_IP_IFACE=eth1
GUEST_INTERFACE_DEFAULT=<%= @guest_interface_default %>
HOST_IP_IFACE=<%= @host_ip_iface %>
# logging configuration parameters