Merge "Add openstackci/openstackzuul oscc clouds to all-clouds"

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

@@ -44,6 +44,17 @@ clouds:
       project_domain_name: default
       user_domain_name: default
     identity_api_version: '3'
+  openstackci-infracloud:
+    region_name: RegionOne
+    auth:
+      auth_url: https://controller00.vanilla.ic.openstack.org:5000
+      username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %>
+      password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %>
+      project_domain_name: default
+      user_domain_name: default
+    identity_api_version: '3'
+    cacert: /etc/ssl/certs/ca-certificates.crt
   openstackci-internap:
     region_name: nyj01
     profile: internap
@@ -93,6 +104,17 @@ clouds:
       project_domain_name: default
       user_domain_name: default
     identity_api_version: '3'
+  openstackzuul-infracloud:
+    region_name: RegionOne
+    auth:
+      auth_url: https://controller00.vanilla.ic.openstack.org:5000
+      username: <%= @puppetmaster_clouds['openstackzuul_infracloud_username'] %>
+      password: <%= @puppetmaster_clouds['openstackzuul_infracloud_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackzuul_infracloud_project_name'] %>
+      project_domain_name: default
+      user_domain_name: default
+    identity_api_version: '3'
+    cacert: /etc/ssl/certs/ca-certificates.crt
   openstackjenkins-rax:
     regions:
       - DFW