openstack
/
devstack-vagrant
Code Issues Proposed changes

Merge "Add IP_VERSION in template, set default as ipv4 only"

This commit is contained in:
Zuul 2023-06-30 18:09:43 +00:00 committed by Gerrit Code Review
parent 8fbf1740fe 3155394109
commit b3acef86f3
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Vagrantfile vendored
View File

@ -76,6 +76,7 @@ def configure_vm(name, vm, conf)
"guest_interface_default" => conf["guest_interface_default"] || "enp0s8",
"host_ip_iface" => conf["host_ip_iface"] || "enp0s8",
"vagrant_username" => conf["vagrant_username"] || "ubuntu",
"ip_version" => conf["ip_version"] || "4",
}
# add all the rest of the content in the conf file
conf.each do |k, v|

3
config.yaml.sample
View File

@ -76,6 +76,9 @@ bridge_int: eth1
#guest_interface_default: eth1
#host_ip_iface: eth1
# IP version to configure Neutron to create either an Pv4, IPv6, or dual-stack self-service project data-network by with either ip_version:4, ip_version:6, or ip_version:4+6 respectively.
#ip_version: 4
# Extra images to download and add to glance, a list of url's comma separated
# for new images to be added to glance
#extra_images: https://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img,https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img

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

@ -20,6 +20,7 @@ DATABASE_TYPE=mysql
GUEST_INTERFACE_DEFAULT=<%= @guest_interface_default %>
HOST_IP_IFACE=<%= @host_ip_iface %>
IP_VERSION=<%= @ip_version %>
# logging configuration parameters