From 77e38475fbdf339db9c474646898f3368d2b7e76 Mon Sep 17 00:00:00 2001
From: David Moreau Simard <dmsimard@redhat.com>
Date: Thu, 22 Mar 2018 14:53:40 -0400
Subject: [PATCH] Add limestone-specific network configuration to *clouds.yaml

Limestone provides both ipv4 and ipv6 addresses. Add the necessary
configuration to clouds.yaml to make it work.

Change-Id: I3c717132a42f44aaed6568de6780b1972cbf63d0
---
 .../puppetmaster/all-clouds.yaml.erb          | 22 +++++++++++++++++--
 .../puppetmaster/ansible-clouds.yaml.erb      | 11 +++++++++-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index 47987df81d..5e2f1f878e 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -131,7 +131,16 @@ clouds:
       user_domain_name: default
   openstackci-limestone:
     regions:
-      - RegionOne
+      - name: RegionOne
+        values:
+          networks:
+            - name: "Gateway Network"
+              routes_externally: false
+              routes_ipv6_externally: true
+              nat_destination: true
+            - name: "Flat External"
+              routes_externally: true
+              nat_source: true
     auth:
       auth_url: https://osa.continuous.pw:5000
       username: <%= @puppetmaster_clouds['openstackci_limestone_username'] %>
@@ -143,7 +152,16 @@ clouds:
     cacert: /etc/openstack/limestone_cacert.pem
   openstackzuul-limestone:
     regions:
-      - RegionOne
+      - name: RegionOne
+        values:
+          networks:
+            - name: "Gateway Network"
+              routes_externally: false
+              routes_ipv6_externally: true
+              nat_destination: true
+            - name: "Flat External"
+              routes_externally: true
+              nat_source: true
     auth:
       auth_url: https://osa.continuous.pw:5000
       username: <%= @puppetmaster_clouds['openstackzuul_limestone_username'] %>
diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
index c1d2ceafc4..8485ab9ea0 100644
--- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
@@ -77,7 +77,16 @@ clouds:
       user_domain_name: default
   openstackci-limestone:
     regions:
-      - RegionOne
+      - name: RegionOne
+        values:
+          networks:
+            - name: "Gateway Network"
+              routes_externally: false
+              routes_ipv6_externally: true
+              nat_destination: true
+            - name: "Flat External"
+              routes_externally: true
+              nat_source: true
     auth:
       auth_url: https://osa.continuous.pw:5000
       username: <%= @puppetmaster_clouds['openstackci_limestone_username'] %>