diff --git a/doc/source/bandersnatch.rst b/doc/source/bandersnatch.rst index e971085d83..84e6fcd9b3 100644 --- a/doc/source/bandersnatch.rst +++ b/doc/source/bandersnatch.rst @@ -12,6 +12,7 @@ At a Glance :Hosts: * http://pypi.openstack.org (deprecated) + * http://pypi.bhs1.openstack.org * http://pypi.dfw.openstack.org * http://pypi.gra1.openstack.org * http://pypi.iad.openstack.org diff --git a/modules/openstack_project/manifests/cacti.pp b/modules/openstack_project/manifests/cacti.pp index c6b2fe0c90..44a5ac2f68 100644 --- a/modules/openstack_project/manifests/cacti.pp +++ b/modules/openstack_project/manifests/cacti.pp @@ -142,6 +142,7 @@ class openstack_project::cacti ( 'proposal.slave.openstack.org', 'puppetdb.openstack.org', 'puppetmaster.openstack.org', + 'pypi.bhs1.openstack.org', 'pypi.dfw.openstack.org', 'pypi.gra1.openstack.org', 'pypi.iad.openstack.org', diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp index a6b2c85070..8c3cb4d2a4 100644 --- a/modules/openstack_project/manifests/server.pp +++ b/modules/openstack_project/manifests/server.pp @@ -16,6 +16,7 @@ class openstack_project::server ( $manage_exim = true, $pypi_index_url = 'https://pypi.python.org/simple', $pypi_trusted_hosts = [ + 'pypi.bhs1.openstack.org', 'pypi.dfw.openstack.org', 'pypi.gra1.openstack.org', 'pypi.iad.openstack.org', diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp index ef2887fc41..04cc6a7685 100644 --- a/modules/openstack_project/manifests/template.pp +++ b/modules/openstack_project/manifests/template.pp @@ -20,6 +20,7 @@ class openstack_project::template ( $sysadmins = [], $pypi_index_url = 'https://pypi.python.org/simple', $pypi_trusted_hosts = [ + 'pypi.bhs1.openstack.org', 'pypi.dfw.openstack.org', 'pypi.gra1.openstack.org', 'pypi.iad.openstack.org', diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index 3d81bfcb41..4aaed890ca 100644 --- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb +++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb @@ -20,7 +20,9 @@ clouds: project_name: '<%= hpcloud_project %>' ovh: profile: ovh - region_name: GRA1 + regions: + - BHS1 + - GRA1 auth: username: '<%= ovh_username %>' password: '<%= ovh_password %>'