opendev
/
system-config
Code Issues Proposed changes

Remove bluebox cloud 

This cloud is being decommissioned.

Change-Id: I26b51425d21e3ee86eb36763e1dedfd65e78d2b7
This commit is contained in:
Jesse Keating 2017-06-29 15:18:16 -07:00
parent 2225000166
commit 1d41039356
9 changed files with 3 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/source/bandersnatch.rst
View File

@ -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:

1
hiera/common.yaml
View File

@ -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

9
manifests/site.pp
View File

@ -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')

10
modules/openstack_project/templates/nodepool/clouds.yaml.erb
View File

@ -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:

16
modules/openstack_project/templates/nodepool/nodepool-builder.logging.conf.erb
View File

@ -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

33
modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
View File

@ -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:

11
modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
View File

@ -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:

14
playbooks/clouds_layouts.yml
View File

@ -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:

2
tools/clean-fips.py
View File

@ -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]