From 823f587d37a130aae90f9ac15078b829ee556913 Mon Sep 17 00:00:00 2001
From: Gabriele Cerami <gcerami@redhat.com>
Date: Tue, 22 Nov 2016 17:00:27 +0100
Subject: [PATCH] prep-network: add support to IPv6 topology

Change-Id: I4c6ce5f9bb5760873c064bc570ed966d255413ff
---
 roles/overcloud-prep-network/meta/main.yml    |  1 +
 .../templates/overcloud-prep-network.sh.j2    | 23 +++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/roles/overcloud-prep-network/meta/main.yml b/roles/overcloud-prep-network/meta/main.yml
index 97b7a87bd..f1eb69920 100644
--- a/roles/overcloud-prep-network/meta/main.yml
+++ b/roles/overcloud-prep-network/meta/main.yml
@@ -1,3 +1,4 @@
 dependencies:
   - libvirt
   - tripleo
+  - extras-common
diff --git a/roles/overcloud-prep-network/templates/overcloud-prep-network.sh.j2 b/roles/overcloud-prep-network/templates/overcloud-prep-network.sh.j2
index d39347cb1..4cfa79ee0 100644
--- a/roles/overcloud-prep-network/templates/overcloud-prep-network.sh.j2
+++ b/roles/overcloud-prep-network/templates/overcloud-prep-network.sh.j2
@@ -14,14 +14,13 @@ set -eux
 
 source {{ working_dir }}/stackrc
 
-{% if network_isolation == true and ipv6 == false %}
+{% if network_isolation|bool %}
 
 ## Setup Networking
 ## ----------------
 
 ## * Enable NAT for "external" network.
 ## ::
-
 RULE="-s {{undercloud_external_network_cidr}} ! -d {{undercloud_external_network_cidr}} -j MASQUERADE"
 
 if ! sudo iptables -t nat -C BOOTSTACK_MASQ $RULE; then
@@ -31,6 +30,7 @@ fi
 
 {% for name, network in (undercloud_networks|default({})).items() if name == 'external' %}
 
+{% if not overcloud_ipv6|bool %}
 sudo bash -c 'cat <<EOF > /etc/sysconfig/network-scripts/ifcfg-vlan{{ network.tag }}
 DEVICE=vlan{{ network.tag }}
 ONBOOT=yes
@@ -44,7 +44,26 @@ OVS_OPTIONS={{ network.ovs_options }}
 EOF'
 
 sudo ifup ifcfg-vlan{{ network.tag }}
+
+{% else %}
+
+sudo bash -c 'cat <<EOF > /etc/sysconfig/network-scripts/ifcfg-eth6
+DEVICE=eth6
+ONBOOT=yes
+BOOTPROTO=static
+IPADDR={{ network.address }}
+NETMASK={{ network.netmask }}
+IPV6ADDR={{ network.address6 }}
+IPV6INIT=yes
+EOF'
+
+sudo ifup ifcfg-eth6
+
+{%endif%}
+
+
 {% endfor %}
+
 {%endif%}
 
 ### --stop_docs