diff --git a/doc/source/bandersnatch.rst b/doc/source/bandersnatch.rst index c2a5151ce9..faab497b4f 100644 --- a/doc/source/bandersnatch.rst +++ b/doc/source/bandersnatch.rst @@ -18,7 +18,6 @@ At a Glance * http://mirror.iad.rax.openstack.org/pypi * http://mirror.nyj01.internap.openstack.org/pypi * http://mirror.ord.rax.openstack.org/pypi - * http://mirror.regionone.bluebox-sjc1.openstack.org/pypi :Puppet: * :file:`modules/openstack_project/manifests/static.pp` :Projects: diff --git a/hiera/common.yaml b/hiera/common.yaml index 04ec0888d3..325a1985eb 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -474,7 +474,6 @@ cacti_hosts: - mirror.mtl01.internap.openstack.org - mirror.nyj01.internap.openstack.org - mirror.ord.rax.openstack.org -- mirror.regionone.bluebox-sjc1.openstack.org - mirror.regionone.osic-cloud1.openstack.org - mirror.regionone.infracloud-chocolate.openstack.org - mirror.regionone.infracloud-vanilla.openstack.org diff --git a/manifests/site.pp b/manifests/site.pp index 408e4b5c79..933d15b523 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -804,9 +804,6 @@ node 'nodepool.openstack.org' { $group = 'nodepool' # TODO(pabelanger): Move all of this back into nodepool manifest, it has # grown too big. - $bluebox_username = hiera('nodepool_bluebox_username', 'username') - $bluebox_password = hiera('nodepool_bluebox_password') - $bluebox_project = hiera('nodepool_bluebox_project', 'project') $rackspace_username = hiera('nodepool_rackspace_username', 'username') $rackspace_password = hiera('nodepool_rackspace_password') $rackspace_project = hiera('nodepool_rackspace_project', 'project') @@ -920,9 +917,6 @@ node /^nl\d+\.openstack\.org$/ { $group = 'nodepool' # TODO(pabelanger): Move all of this back into nodepool manifest, it has # grown too big. - $bluebox_username = hiera('nodepool_bluebox_username', 'username') - $bluebox_password = hiera('nodepool_bluebox_password') - $bluebox_project = hiera('nodepool_bluebox_project', 'project') $rackspace_username = hiera('nodepool_rackspace_username', 'username') $rackspace_password = hiera('nodepool_rackspace_password') $rackspace_project = hiera('nodepool_rackspace_project', 'project') @@ -1001,9 +995,6 @@ node /^nb\d+\.openstack\.org$/ { $group = 'nodepool' # TODO(pabelanger): Move all of this back into nodepool manifest, it has # grown too big. - $bluebox_username = hiera('nodepool_bluebox_username', 'username') - $bluebox_password = hiera('nodepool_bluebox_password') - $bluebox_project = hiera('nodepool_bluebox_project', 'project') $rackspace_username = hiera('nodepool_rackspace_username', 'username') $rackspace_password = hiera('nodepool_rackspace_password') $rackspace_project = hiera('nodepool_rackspace_project', 'project') diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index e35bd5da34..eaafd0f577 100644 --- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb +++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb @@ -42,16 +42,6 @@ clouds: project_name: '<%= @tripleo_project %>' auth_url: 'https://ci-overcloud.rh2.tripleo.org:13000/v2.0' floating_ip_source: neutron - bluebox-sjc1: - auth: - auth_url: https://montytaylor-sjc.openstack.blueboxgrid.com:5000 - username: '<%= @bluebox_username %>' - password: '<%= @bluebox_password %>' - project_name: '<%= @bluebox_project %>' - project_domain_name: default - user_domain_name: default - identity_api_version: '3' - identity_endpoint_override: 'https://montytaylor-sjc.openstack.blueboxgrid.com:5000/v3' internap: profile: internap auth: diff --git a/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb b/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb index 05d1371210..374809e61d 100644 --- a/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb +++ b/modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb @@ -10,7 +10,7 @@ keys=root,nodepool,requests,shade,image,kazoo, dib_debian-jessie, dib_ubuntu-trusty, dib_ubuntu-xenial, dib_centos-7, dib_fedora-25, dib_opensuse-422, rax-dfw_upload, rax-ord_upload, rax-iad_upload, ovh-gra1_upload, ovh-bhs1_upload, - bluebox-sjc1_upload, internap-mtl01_upload, osic-cloud1-s3500_upload, + internap-mtl01_upload, osic-cloud1-s3500_upload, osic-cloud1-s3700_upload, tripleo-test-cloud-rh1_upload, infracloud-vanilla_upload, infracloud-chocolate_upload, citycloud-lon1_upload, citycloud-kna1_upload, citycloud-la1_upload, @@ -21,7 +21,7 @@ keys=console,debug,normal,image, dib_debian-jessie, dib_ubuntu-trusty, dib_ubuntu-xenial, dib_centos-7, dib_fedora-25, dib_opensuse-422, rax-dfw_upload, rax-ord_upload, rax-iad_upload, ovh-gra1_upload, ovh-bhs1_upload, - bluebox-sjc1_upload, internap-mtl01_upload, osic-cloud1-s3500_upload, + internap-mtl01_upload, osic-cloud1-s3500_upload, osic-cloud1-s3700_upload, tripleo-test-cloud-rh1_upload, infracloud-vanilla_upload, infracloud-chocolate_upload, citycloud-lon1_upload, citycloud-kna1_upload, citycloud-la1_upload, @@ -224,18 +224,6 @@ class=logging.handlers.TimedRotatingFileHandler formatter=simple args=('<%= @upload_log_document_root %>/ovh-bhs1.log', 'H', 8, 30,) -[logger_bluebox-sjc1_upload] -level=DEBUG -handlers=bluebox-sjc1_upload -qualname=nodepool.image.upload.bluebox-sjc1 -propagate=0 - -[handler_bluebox-sjc1_upload] -level=DEBUG -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('<%= @upload_log_document_root %>/bluebox-sjc1.log', 'H', 8, 30,) - [logger_internap-mtl01_upload] level=DEBUG handlers=internap-mtl01_upload diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index b908a4352a..ee32a42080 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -1,15 +1,4 @@ clouds: - admin-bluebox: - region_name: RegionOne - auth: - auth_url: https://montytaylor-sjc.openstack.blueboxgrid.com:5000 - username: <%= @puppetmaster_clouds['admin_bluebox_username'] %> - password: <%= @puppetmaster_clouds['admin_bluebox_password'] %> - project_name: <%= @puppetmaster_clouds['admin_bluebox_project_name'] %> - project_domain_name: default - user_domain_name: default - identity_api_version: '3' - identity_endpoint_override: 'https://montytaylor-sjc.openstack.blueboxgrid.com:5000/v3' admin-infracloud-vanilla: region_name: RegionOne auth: @@ -46,17 +35,6 @@ clouds: password: <%= @puppetmaster_clouds['infra_files_rw_password'] %> project_name: <%= @puppetmaster_clouds['infra_files_rw_project_name'] %> region_name: DFW - openstackci-bluebox: - region_name: RegionOne - auth: - auth_url: https://montytaylor-sjc.openstack.blueboxgrid.com:5000 - username: <%= @puppetmaster_clouds['openstackci_bluebox_username'] %> - password: <%= @puppetmaster_clouds['openstackci_bluebox_password'] %> - project_name: <%= @puppetmaster_clouds['openstackci_bluebox_project_name'] %> - project_domain_name: default - user_domain_name: default - identity_api_version: '3' - identity_endpoint_override: 'https://montytaylor-sjc.openstack.blueboxgrid.com:5000/v3' openstackci-infracloud-vanilla: region_name: RegionOne auth: @@ -139,17 +117,6 @@ clouds: username: <%= @puppetmaster_clouds['openstackci_rax_username'] %> password: <%= @puppetmaster_clouds['openstackci_rax_password'] %> project_id: <%= @puppetmaster_clouds['openstackci_rax_project_id'] %> - openstackzuul-bluebox: - region_name: RegionOne - auth: - auth_url: https://montytaylor-sjc.openstack.blueboxgrid.com:5000 - username: <%= @puppetmaster_clouds['openstackzuul_bluebox_username'] %> - password: <%= @puppetmaster_clouds['openstackzuul_bluebox_password'] %> - project_name: <%= @puppetmaster_clouds['openstackzuul_bluebox_project_name'] %> - project_domain_name: default - user_domain_name: default - identity_api_version: '3' - identity_endpoint_override: 'https://montytaylor-sjc.openstack.blueboxgrid.com:5000/v3' openstackzuul-infracloud-vanilla: region_name: RegionOne auth: diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb index 2088395bfa..6883e65c15 100644 --- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb @@ -103,17 +103,6 @@ clouds: user_domain_name: default floating_ip_source: neutron identity_api_version: '3' - openstackci-bluebox: - region_name: RegionOne - auth: - auth_url: https://montytaylor-sjc.openstack.blueboxgrid.com:5000 - username: <%= @puppetmaster_clouds['openstackci_bluebox_username'] %> - password: <%= @puppetmaster_clouds['openstackci_bluebox_password'] %> - project_name: <%= @puppetmaster_clouds['openstackci_bluebox_project_name'] %> - project_domain_name: default - user_domain_name: default - identity_api_version: '3' - identity_endpoint_override: 'https://montytaylor-sjc.openstack.blueboxgrid.com:5000/v3' openstackci-infracloud-vanilla: region_name: RegionOne auth: diff --git a/playbooks/clouds_layouts.yml b/playbooks/clouds_layouts.yml index 8c886d29e6..e68d4890e2 100644 --- a/playbooks/clouds_layouts.yml +++ b/playbooks/clouds_layouts.yml @@ -113,20 +113,6 @@ profiles: cidr: '10.0.1.0/24' clouds: - # bluebox-sjc1 - - name: admin-bluebox - profiles: - - openstackci-projects - - openstackci-flavors - - name: openstackci-bluebox - profiles: - - openstackci-keypairs - - openstackci-security - - name: openstackzuul-bluebox - profiles: - - openstackci-keypairs - - openstackci-security - # osic-cloud1 - name: openstackci-osic-cloud1 profiles: diff --git a/tools/clean-fips.py b/tools/clean-fips.py index 0c016d618a..5e332f3a93 100755 --- a/tools/clean-fips.py +++ b/tools/clean-fips.py @@ -16,7 +16,7 @@ import shade -for cloud in ('osic-cloud1', 'bluebox-sjc1'): +for cloud in ('osic-cloud1',): cloud = shade.openstack_cloud(cloud=cloud) cleaned = [cloud.delete_floating_ip(ip.id) for ip in cloud.list_floating_ips() if ip.attached is False]