Merge "Add inap cloud definition"

modules/openstack_project/templates/nodepool/clouds.yaml.erb

@@ -61,6 +61,25 @@ clouds:
               routes_externally: True
             - name: inap-17304-LAN3326
               routes_externally: False
+  inap:
+    profile: internap
+    auth:
+      username: '<%= @internap_username %>'
+      password: '<%= @internap_password %>'
+      project_name: '<%= @internap_project %>'
+    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
   vexxhost:
     region_name: ca-ymq-1
     profile: vexxhost

modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb

@@ -78,6 +78,25 @@ clouds:
               routes_externally: True
             - name: inap-17301-LAN3328
               routes_externally: False
+  openstackci-inap:
+    profile: internap
+    auth:
+      username: <%= @puppetmaster_clouds['openstackci_internap_username'] %>
+      password: <%= @puppetmaster_clouds['openstackci_internap_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %>
+    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:
     profile: internap
     auth:
@@ -97,6 +116,25 @@ clouds:
               routes_externally: True
             - name: inap-17304-LAN3326
               routes_externally: False
+  openstackjenkins-inap:
+    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

modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb

@@ -29,6 +29,25 @@ clouds:
               routes_externally: True
             - name: inap-17301-LAN3328
               routes_externally: False
+  openstackci-inap:
+    profile: internap
+    auth:
+      username: <%= @puppetmaster_clouds['openstackci_internap_username'] %>
+      password: <%= @puppetmaster_clouds['openstackci_internap_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %>
+    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

playbooks/clouds_layouts.yml

@@ -152,6 +152,19 @@ clouds:
     profiles:
       - openstackci-keypairs
       - openstackci-security
+  # inap
+  - name: openstackci-inap-mtl01
+    oscc_cloud: openstackci-inap
+    region_name: mtl01
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+  - name: openstackjenkins-inap-mtl01
+    oscc_cloud: openstackjenkins-inap
+    region_name: mtl01
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
 
   # rackspace
   - name: openstackci-rax-dfw