Merge "Add Linaro US cloud"

inventory/groups.yaml

@@ -177,7 +177,7 @@ groups:
     - logstash-worker[0-9]*.open*.org
     - logstash[0-9]*.open*.org
     - mirror-update[0-9]*.openstack.org
-    - ^mirror[0-9].*\..*\.(?!linaro|linaro-london).*\.openstack\.org
+    - ^mirror[0-9].*\..*\.(?!linaro|linaro-london|linaro-us).*\.openstack\.org
     - ^nb(?!03)[0-9]*\.open.*\.org
     - nl[0-9]*.open*.org
     - openstackid[0-9]*.openstack.org

playbooks/clouds_layouts.yml

@@ -336,6 +336,20 @@ clouds:
       - openstackci-keypairs
       - openstackci-security
 
+  - name: openstackci-linaro-us
+    oscc_cloud: openstackci-linaro-us
+    region_name: RegionOne
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+
+  - name: openstackzuul-linaro-us
+    oscc_cloud: openstackzuul-linaro-us
+    region_name: RegionOne
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+
   # Limestone
   - name: openstackci-limestone
     oscc_cloud: openstackci-limestone

playbooks/templates/clouds/bridge_all_clouds.yaml.j2

@@ -171,6 +171,28 @@ clouds:
       project_domain_name: default
       user_domain_name: default
     identity_api_version: 3
+  openstackci-linaro-us:
+    regions:
+      - RegionOne
+    auth:
+      auth_url: https://us.linaro.cloud:5000
+      username: '{{ clouds.openstackci_linaro_us_username }}'
+      password: '{{ clouds.openstackci_linaro_us_password }}'
+      project_name: '{{ clouds.openstackci_linaro_us_project_name }}'
+      project_domain_name: default
+      user_domain_name: default
+    identity_api_version: 3
+  openstackzuul-linaro-us:
+    regions:
+      - RegionOne
+    auth:
+      auth_url: https://us.linaro.cloud:5000
+      username: '{{ clouds.openstackzuul_linaro_us_username }}'
+      password: '{{ clouds.openstackzuul_linaro_us_password }}'
+      project_name: '{{ clouds.openstackzuul_linaro_us_project_name }}'
+      project_domain_name: default
+      user_domain_name: default
+    identity_api_version: 3
   openstackci-limestone:
     regions:
       - name: RegionOne

playbooks/templates/clouds/bridge_clouds.yaml.j2

@@ -98,6 +98,17 @@ clouds:
       project_domain_name: default
       user_domain_name: default
     identity_api_version: 3
+  openstackci-linaro-us:
+    regions:
+      - RegionOne
+    auth:
+      auth_url: https://us.linaro.cloud:5000
+      username: '{{ clouds.openstackci_linaro_us_username }}'
+      password: '{{ clouds.openstackci_linaro_us_password }}'
+      project_name: '{{ clouds.openstackci_linaro_us_project_name }}'
+      project_domain_name: default
+      user_domain_name: default
+    identity_api_version: 3
   openstackci-limestone:
     regions:
       - name: RegionOne

playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2

@@ -121,6 +121,17 @@ clouds:
       project_name: '{{ nodepool_linaro_london_project }}'
       project_domain_name: default
       user_domain_name: default
+  linaro-us:
+    regions:
+      - RegionOne
+    identity_api_version: '3'
+    auth:
+      auth_url: https://us.linaro.cloud:5000
+      username: '{{ nodepool_linaro_us_username }}'
+      password: '{{ nodepool_linaro_us_password }}'
+      project_name: '{{ nodepool_linaro_us_project }}'
+      project_domain_name: default
+      user_domain_name: default
   limestone:
     regions:
       - name: RegionOne

playbooks/templates/clouds/nodepool_clouds.yaml.j2

@@ -98,6 +98,17 @@ clouds:
       project_name: '{{ nodepool_linaro_london_project }}'
       project_domain_name: default
       user_domain_name: default
+  linaro-us:
+    regions:
+      - RegionOne
+    identity_api_version: '3'
+    auth:
+      auth_url: https://us.linaro.cloud:5000
+      username: '{{ nodepool_linaro_us_username }}'
+      password: '{{ nodepool_linaro_us_password }}'
+      project_name: '{{ nodepool_linaro_us_project }}'
+      project_domain_name: default
+      user_domain_name: default
   limestone:
     regions:
       - name: RegionOne

playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2

@@ -34,6 +34,12 @@ clouds:
   openstackzuul_linaro_london_username: user
   openstackzuul_linaro_london_password: password
   openstackzuul_linaro_london_project_name: project
+  openstackci_linaro_us_username: user
+  openstackci_linaro_us_password: password
+  openstackci_linaro_us_project_name: project
+  openstackzuul_linaro_us_username: user
+  openstackzuul_linaro_us_password: password
+  openstackzuul_linaro_us_project_name: project
   openstackci_limestone_username: user
   openstackci_limestone_password: password
   openstackci_limestone_project_name: project

playbooks/zuul/templates/group_vars/nodepool.yaml.j2

@@ -17,6 +17,9 @@ nodepool_citycloud_password: password
 nodepool_linaro_london_username: user
 nodepool_linaro_london_password: password
 nodepool_linaro_london_project: project
+nodepool_linaro_us_username: user
+nodepool_linaro_us_password: password
+nodepool_linaro_us_project: project
 nodepool_limestone_username: user
 nodepool_limestone_password: password
 nodepool_limestone_project: project

playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2

@@ -34,6 +34,12 @@ clouds:
   openstackzuul_linaro_london_username: user
   openstackzuul_linaro_london_password: password
   openstackzuul_linaro_london_project_name: project
+  openstackci_linaro_us_username: user
+  openstackci_linaro_us_password: password
+  openstackci_linaro_us_project_name: project
+  openstackzuul_linaro_us_username: user
+  openstackzuul_linaro_us_password: password
+  openstackzuul_linaro_us_project_name: project
   openstackci_limestone_username: user
   openstackci_limestone_password: password
   openstackci_limestone_project_name: project