From 99526dee00ac7d6bc79413f11db1ad4acea174a3 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Thu, 25 Aug 2016 11:14:34 -0400
Subject: [PATCH] Add mtl01 region to internap on puppetmaster

Internap has offered up a new region for openstack-infra to use. Add
the region to puppetmaster first so we can start bootstrapping the
cloud.

We also update our configuration to reflect the different networks in
each region.

Change-Id: I2a135c19753f79c5ab24fb821af37d7e1eae9485
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 .../puppetmaster/all-clouds.yaml.erb          | 33 +++++++++++++++----
 .../puppetmaster/ansible-clouds.yaml.erb      | 19 +++++++----
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index b9fbd3cc52..31a1ca6db6 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -56,24 +56,43 @@ clouds:
     identity_api_version: '3'
     cacert: /etc/ssl/certs/ca-certificates.crt
   openstackci-internap:
-    region_name: nyj01
     profile: internap
     auth:
       username: <%= @puppetmaster_clouds['openstackci_internap_username'] %>
       password: <%= @puppetmaster_clouds['openstackci_internap_password'] %>
       project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %>
-    networks: 
-      - name: inap-17301-WAN2344
-        routes_externally: True
-      - name: inap-17301-LAN3328
-        routes_externally: False
+    regions:
+      - name: mtl01
+        values:
+          networks:
+            - name: inap-17301-WAN1102
+              routes_externally: True
+      - name: nyj01
+        values:
+          networks:
+            - name: inap-17301-WAN2344
+              routes_externally: True
+            - name: inap-17301-LAN3328
+              routes_externally: False
   openstackjenkins-internap:
-    region_name: nyj01
     profile: internap
     auth:
       username: <%= @puppetmaster_clouds['openstackjenkins_internap_username'] %>
       password: <%= @puppetmaster_clouds['openstackjenkins_internap_password'] %>
       project_name: <%= @puppetmaster_clouds['openstackjenkins_internap_project_name'] %>
+    regions:
+      - name: mtl01
+        values:
+          networks:
+            - name: inap-17304-WAN1101
+              routes_externally: True
+      - name: nyj01
+        values:
+          networks:
+            - name: inap-17304-WAN2342
+              routes_externally: True
+            - name: inap-17304-LAN3326
+              routes_externally: False
   openstackci-ovh:
     regions:
       - GRA1
diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
index 3cac538ef4..bff0cd70de 100644
--- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
@@ -7,17 +7,24 @@ cache:
   path: /var/cache/ansible-inventory
 clouds:
   openstackci-internap:
-    region_name: nyj01
     profile: internap
     auth:
       username: <%= @puppetmaster_clouds['openstackci_internap_username'] %>
       password: <%= @puppetmaster_clouds['openstackci_internap_password'] %>
       project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %>
-    networks: 
-      - name: inap-17301-WAN2344
-        routes_externally: True
-      - name: inap-17301-LAN3328
-        routes_externally: False
+    regions:
+      - name: mtl01
+        values:
+          networks:
+            - name: inap-17301-WAN1102
+              routes_externally: True
+      - name: nyj01
+        values:
+          networks:
+            - name: inap-17301-WAN2344
+              routes_externally: True
+            - name: inap-17301-LAN3328
+              routes_externally: False
   openstackci-ovh:
     regions:
       - GRA1