From a21fde83ca11fc3227615a84c70225fba15bcc5d Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 31 Jan 2018 15:27:48 -0500 Subject: [PATCH] Remove tripleo-test-cloud-rh(1|2) support We longer have any jobs or need to manage VMs in tripleo-test-cloud-rh(1|2). This hardware still eventually be removed so lets also remove it from our configuration. Change-Id: I588ae945df15beceaf7a60bf6a65b1615b2074f0 Signed-off-by: Paul Belanger --- hiera/common.yaml | 1 - .../templates/nodepool/clouds.yaml.erb | 21 ------------------- .../puppetmaster/all-clouds.yaml.erb | 20 ------------------ .../puppetmaster/ansible-clouds.yaml.erb | 11 ---------- playbooks/clouds_layouts.yml | 10 --------- 5 files changed, 63 deletions(-) diff --git a/hiera/common.yaml b/hiera/common.yaml index ec891a352a..6ebd0bec65 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -495,7 +495,6 @@ cacti_hosts: - mirror.bhs1.ovh.openstack.org - mirror.gra1.ovh.openstack.org - mirror.mtl01.inap.openstack.org -- mirror01.regionone.tripleo-test-cloud-rh1.openstack.org - mirror-update.openstack.org - review-dev.openstack.org - review.openstack.org diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index 103b6cdcc8..8209401b19 100644 --- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb +++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb @@ -29,27 +29,6 @@ clouds: username: '<%= @ovh_username %>' password: '<%= @ovh_password %>' project_name: '<%= @ovh_project %>' - tripleo-test-cloud-rh1: - region_name: regionOne - api_timeout: 60 - auth: - auth_url: https://ci-overcloud.rh1.tripleo.org:13000 - username: '<%= @tripleo_username %>' - password: '<%= @tripleo_password %>' - project_name: '<%= @tripleo_project %>' - project_domain_name: default - user_domain_name: default - floating_ip_source: neutron - identity_api_version: '3' - tripleo-test-cloud-rh2: - region_name: regionOne - api_timeout: 60 - auth: - username: '<%= @tripleo_username %>' - password: '<%= @tripleo_password %>' - project_name: '<%= @tripleo_project %>' - auth_url: 'https://ci-overcloud.rh2.tripleo.org:13000/v2.0' - floating_ip_source: neutron inap: profile: internap api_timeout: 60 diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index 282d00d87d..33f7ecf8f8 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -69,26 +69,6 @@ clouds: username: <%= @puppetmaster_clouds['openstackjenkins_ovh_username'] %> password: <%= @puppetmaster_clouds['openstackjenkins_ovh_password'] %> project_name: <%= @puppetmaster_clouds['openstackjenkins_ovh_project_name'] %> - openstackci-tripleo-test-cloud-rh1: - auth: - auth_url: https://ci-overcloud.rh1.tripleo.org:13000 - username: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_username'] %> - password: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_password'] %> - project_name: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_project_name'] %> - project_domain_name: default - user_domain_name: default - floating_ip_source: neutron - identity_api_version: '3' - openstackzuul-tripleo-test-cloud-rh1: - auth: - auth_url: https://ci-overcloud.rh1.tripleo.org:13000 - username: <%= @puppetmaster_clouds['openstackzuul_tripleo_test_cloud_rh1_username'] %> - password: <%= @puppetmaster_clouds['openstackzuul_tripleo_test_cloud_rh1_password'] %> - project_name: <%= @puppetmaster_clouds['openstackzuul_tripleo_test_cloud_rh1_project_name'] %> - project_domain_name: default - user_domain_name: default - floating_ip_source: neutron - identity_api_version: '3' openstackjenkins-vexxhost: region_name: ca-ymq-1 profile: vexxhost diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb index 8c66c80b82..5bc3f29ec0 100644 --- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb @@ -52,17 +52,6 @@ clouds: username: '<%= @puppetmaster_clouds['openstackci_vexxhost_username'] %>' password: '<%= @puppetmaster_clouds['openstackci_vexxhost_password'] %>' project_name: '<%= @puppetmaster_clouds['openstackci_vexxhost_project_name'] %>' - openstackci-tripleo-test-cloud-rh1: - region_name: regionOne - auth: - auth_url: 'https://ci-overcloud.rh1.tripleo.org:13000' - username: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_username'] %> - password: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_password'] %> - project_name: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_project_name'] %> - project_domain_name: default - user_domain_name: default - floating_ip_source: neutron - identity_api_version: '3' openstackci-citycloud: regions: - Lon1 diff --git a/playbooks/clouds_layouts.yml b/playbooks/clouds_layouts.yml index 9383255374..25edcf2932 100644 --- a/playbooks/clouds_layouts.yml +++ b/playbooks/clouds_layouts.yml @@ -189,16 +189,6 @@ clouds: profiles: - openstackci-keypairs - # tripleo-test-cloud-rh1 - - name: openstackci-tripleo-test-cloud-rh1 - profiles: - - openstackci-keypairs - - openstackci-security - - name: openstackzuul-tripleo-test-cloud-rh1 - profiles: - - openstackci-keypairs - - openstackci-security - # Citycloud - name: openstackci-citycloud-Lon1 oscc_cloud: openstackci-citycloud