Merge "Add BHS1 pypi mirror"

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

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',

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',

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',

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 %>'