Add IP_VERSION in template, set default as ipv4 only

For some environments (include mine), ipv6 instructions in stack.sh does not work.

Change-Id: I4b5c69f57191628664450330a08248aae05c2813

Vagrantfile

@@ -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|

config.yaml.sample

@@ -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

puppet/modules/devstack/templates/local.erb

@@ -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