Merge "Cleanup Citycloud Lon1"

2018-10-15 19:00:50 +00:00 · 2018-10-15 19:00:50 +00:00 · e637ee5e2e
commit e637ee5e2e
parent abece6272a 133a94361a
3 changed files with 0 additions and 27 deletions
--- a/playbooks/clouds_layouts.yml
+++ b/playbooks/clouds_layouts.yml
@ -242,30 +242,6 @@ clouds:
      - openstackci-keypairs

  # Citycloud
-  - name: openstackci-citycloud-Lon1
-    oscc_cloud: openstackci-citycloud
-    region_name: Lon1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackci-networking
-    routers:
-      - name: openstackci-router1
-        network: ext-net
-        interfaces:
-          - openstackci-subnet1
-  - name: openstackzuul-citycloud-Lon1
-    oscc_cloud: openstackzuul-citycloud
-    region_name: Lon1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackzuul-networking
-    routers:
-      - name: openstackzuul-router1
-        network: ext-net
-        interfaces:
-          - openstackzuul-subnet1
  - name: openstackci-citycloud-La1
    oscc_cloud: openstackci-citycloud
    region_name: La1
--- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
+++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
@ -120,7 +120,6 @@ clouds:
      user_domain_name: default
  openstackci-citycloud:
    regions:
-      - Lon1
      - Kna1
      - La1
      - Sto2
@ -133,7 +132,6 @@ clouds:
      user_domain_id: a5e7d1a8f25b42b081cf89d1130638da
  openstackzuul-citycloud:
    regions:
-      - Lon1
      - Kna1
      - La1
      - Sto2
--- a/playbooks/templates/clouds/bridge_clouds.yaml.j2
+++ b/playbooks/templates/clouds/bridge_clouds.yaml.j2
@ -73,7 +73,6 @@ clouds:
      user_domain_name: default
  openstackci-citycloud:
    regions:
-      - Lon1
      - Kna1
      - La1
      - Sto2