Merge "Add credentials for osic-cloud8"

manifests/site.pp

@@ -748,6 +748,9 @@ node 'nodepool.openstack.org' {
   $osic_cloud1_username         = hiera('nodepool_osic_cloud1_username', 'username')
   $osic_cloud1_password         = hiera('nodepool_osic_cloud1_password')
   $osic_cloud1_project          = hiera('nodepool_osic_cloud1_project', 'project')
+  $osic_cloud8_username         = hiera('nodepool_osic_cloud8_username', 'username')
+  $osic_cloud8_password         = hiera('nodepool_osic_cloud8_password')
+  $osic_cloud8_project          = hiera('nodepool_osic_cloud8_project', 'project')
   $vexxhost_username   = hiera('nodepool_vexxhost_username', 'username')
   $vexxhost_password   = hiera('nodepool_vexxhost_password')
   $vexxhost_project    = hiera('nodepool_vexxhost_project', 'project')

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

@@ -87,6 +87,24 @@ clouds:
         routes_ipv4_externally: false
     identity_api_version: '3'
     floating_ip_source: None
+  osic-cloud8:
+    region_name: RegionOne
+    auth:
+      auth_url: https://cloud8.weareopenstack.org:9007
+      username: <%= @osic_cloud8_username %>
+      password: <%= @osic_cloud8_password %>
+      project_name: <%= @osic_cloud8_project %>
+      project_domain_name: default
+      user_domain_name: default
+    networks:
+      - name: external-v4
+        routes_externally: true
+      - name: external-v6
+        routes_externally: true
+        routes_ipv6_externally: true
+        routes_ipv4_externally: false
+    identity_api_version: '3'
+    floating_ip_source: None
   vexxhost:
     region_name: ca-ymq-1
     profile: vexxhost

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

@@ -220,6 +220,42 @@ clouds:
         routes_ipv4_externally: false
     identity_api_version: '3'
     floating_ip_source: None
+  openstackci-osic-cloud8:
+    region_name: RegionOne
+    auth:
+      auth_url: https://cloud8.weareopenstack.org:9007
+      username: <%= @puppetmaster_clouds['openstackci_osic_cloud8_username'] %>
+      password: <%= @puppetmaster_clouds['openstackci_osic_cloud8_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackci_osic_cloud8_project_name'] %>
+      project_domain_name: default
+      user_domain_name: default
+    networks:
+      - name: external-v4
+        routes_externally: true
+      - name: external-v6
+        routes_externally: true
+        routes_ipv6_externally: true
+        routes_ipv4_externally: false
+    identity_api_version: '3'
+    floating_ip_source: None
+  openstackzuul-osic-cloud8:
+    region_name: RegionOne
+    auth:
+      auth_url: https://cloud8.weareopenstack.org:9007
+      username: <%= @puppetmaster_clouds['openstackzuul_osic_cloud8_username'] %>
+      password: <%= @puppetmaster_clouds['openstackzuul_osic_cloud8_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackzuul_osic_cloud8_project_name'] %>
+      project_domain_name: default
+      user_domain_name: default
+    networks:
+      - name: external-v4
+        routes_externally: true
+      - name: external-v6
+        routes_externally: true
+        routes_ipv6_externally: true
+        routes_ipv4_externally: false
+    identity_api_version: '3'
+    floating_ip_source: None
   openstackjenkins-vexxhost:
     region_name: ca-ymq-1
     profile: vexxhost

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

@@ -63,6 +63,24 @@ clouds:
         routes_ipv4_externally: false
     identity_api_version: '3'
     floating_ip_source: None
+  openstackci-osic-cloud8:
+    region_name: RegionOne
+    auth:
+      auth_url: https://cloud8.weareopenstack.org:9007
+      username: <%= @puppetmaster_clouds['openstackci_osic_cloud8_username'] %>
+      password: <%= @puppetmaster_clouds['openstackci_osic_cloud8_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackci_osic_cloud8_project_name'] %>
+      project_domain_name: default
+      user_domain_name: default
+    networks:
+      - name: external-v4
+        routes_externally: true
+      - name: external-v6
+        routes_externally: true
+        routes_ipv6_externally: true
+        routes_ipv4_externally: false
+    identity_api_version: '3'
+    floating_ip_source: None
   openstackci-vexxhost:
     region_name: ca-ymq-1
     profile: vexxhost