Cleanup Citycloud Sto2

This region does not show up in catalog listings anymore and is causing
inventory generation for ansible to fail. This change removes Sto2 from
the management side of things so that we can get ansible and puppet
running again.

This does not cleanup nodepool which we can do in a followup once
ansible and puppet are running again.

Change-Id: Ifeea238592b897aa4cea47b723513d7f38d6374b

playbooks/clouds_layouts.yml

@@ -290,30 +290,6 @@ clouds:
         network: ext-net
         interfaces:
           - openstackzuul-subnet1
-  - name: openstackci-citycloud-Sto2
-    oscc_cloud: openstackci-citycloud
-    region_name: Sto2
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackci-networking
-    routers:
-      - name: openstackci-router1
-        network: ext-net
-        interfaces:
-          - openstackci-subnet1
-  - name: openstackzuul-citycloud-Sto2
-    oscc_cloud: openstackzuul-citycloud
-    region_name: Sto2
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackzuul-networking
-    routers:
-      - name: openstackzuul-router1
-        network: ext-net
-        interfaces:
-          - openstackzuul-subnet1
   - name: openstackci-linaro
     oscc_cloud: openstackci-linaro
     region_name: RegionOne

playbooks/templates/clouds/bridge_all_clouds.yaml.j2

@@ -122,7 +122,6 @@ clouds:
     regions:
       - Kna1
       - La1
-      - Sto2
     profile: citycloud
     auth:
       username: '{{ clouds.openstackci_citycloud_username }}'
@@ -134,7 +133,6 @@ clouds:
     regions:
       - Kna1
       - La1
-      - Sto2
     profile: citycloud
     auth:
       username: '{{ clouds.openstackzuul_citycloud_username }}'

playbooks/templates/clouds/bridge_clouds.yaml.j2

@@ -75,7 +75,6 @@ clouds:
     regions:
       - Kna1
       - La1
-      - Sto2
     profile: citycloud
     auth:
       username: '{{ clouds.openstackci_citycloud_username }}'