From 9cf66757bc4bb570eec25bd7c45df9b1ac4a2cf4 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Tue, 9 Apr 2019 11:57:25 +1000
Subject: [PATCH] Remove linaro-cn1 region
This region has been retired. See also
I149e74ff5e788bb860deb4c3cc38d9c8ed5766c6
Change-Id: Ia85587a7bbe52a92d70d6cb96d843ee5f5fc84f6
---
inventory/openstack.yaml | 7 -------
playbooks/templates/clouds/bridge_all_clouds.yaml.j2 | 10 ----------
playbooks/templates/clouds/bridge_clouds.yaml.j2 | 10 ----------
playbooks/templates/clouds/nodepool_clouds.yaml.j2 | 11 -----------
4 files changed, 38 deletions(-)
diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml
index 517cbb27c7..c23c5e3c33 100644
--- a/inventory/openstack.yaml
+++ b/inventory/openstack.yaml
@@ -558,13 +558,6 @@ all:
region_name: ca-ymq-1
public_v4: 162.253.55.61
public_v6: 2604:e100:1:0:f816:3eff:fee2:d1d6
- mirror01.cn1.linaro.openstack.org:
- ansible_host: 103.20.251.153
- location:
- cloud: openstackci-linaro
- region_name: RegionOne
- public_v4: 103.20.251.153
- public_v6: ''
mirror01.gra1.ovh.openstack.org:
ansible_host: 147.135.133.8
location:
diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
index add81beb08..c8e71d713b 100644
--- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
+++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
@@ -150,16 +150,6 @@ clouds:
project_name: 'OpenStack CI Project'
project_domain_name: 'CCP_Domain_27611'
user_domain_name: 'CCP_Domain_27611'
- openstackci-linaro:
- regions:
- - RegionOne
- auth:
- auth_url: https://cn1.linaro.cloud:35357
- username: '{{ clouds.openstackci_linaro_username }}'
- password: '{{ clouds.openstackci_linaro_password }}'
- project_name: '{{ clouds.openstackci_linaro_project_name }}'
- project_domain_name: default
- user_domain_name: default
openstackzuul-linaro:
regions:
- RegionOne
diff --git a/playbooks/templates/clouds/bridge_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_clouds.yaml.j2
index 774aa6d82c..2022dd14ab 100644
--- a/playbooks/templates/clouds/bridge_clouds.yaml.j2
+++ b/playbooks/templates/clouds/bridge_clouds.yaml.j2
@@ -87,16 +87,6 @@ clouds:
project_name: 'Default Project 27611'
project_domain_name: CCP_Domain_27611
user_domain_name: CCP_Domain_27611
- openstackci-linaro:
- regions:
- - RegionOne
- auth:
- auth_url: https://cn1.linaro.cloud:35357
- username: '{{ clouds.openstackci_linaro_username }}'
- password: '{{ clouds.openstackci_linaro_password }}'
- project_name: '{{ clouds.openstackci_linaro_project_name }}'
- project_domain_name: default
- user_domain_name: default
openstackci-linaro-london:
regions:
- London
diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
index f6898ebac9..035032a29a 100644
--- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2
+++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
@@ -86,17 +86,6 @@ clouds:
project_name: 'OpenStack CI Project'
project_domain_name: CCP_Domain_27611
user_domain_name: CCP_Domain_27611
- linaro:
- regions:
- - RegionOne
- identity_api_version: '3'
- auth:
- auth_url: https://cn1.linaro.cloud:35357
- username: '{{ nodepool_linaro_username }}'
- password: '{{ nodepool_linaro_password }}'
- project_name: '{{ nodepool_linaro_project }}'
- project_domain_name: default
- user_domain_name: default
linaro-london:
regions:
- London