opendev/system-config
Code Issues Proposed changes

Merge "Add BHS1 pypi mirror"

Browse Source
This commit is contained in:
Jenkins 2015-11-25 22:28:07 +00:00 committed by Gerrit Code Review
commit cdfa53f1c3
5 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/source/bandersnatch.rst
View File

@ -12,6 +12,7 @@ At a Glance
:Hosts: :Hosts:
* http://pypi.openstack.org (deprecated) * http://pypi.openstack.org (deprecated)
* http://pypi.bhs1.openstack.org
* http://pypi.dfw.openstack.org * http://pypi.dfw.openstack.org
* http://pypi.gra1.openstack.org * http://pypi.gra1.openstack.org
* http://pypi.iad.openstack.org * http://pypi.iad.openstack.org

1
modules/openstack_project/manifests/cacti.pp
View File

@ -142,6 +142,7 @@ class openstack_project::cacti (
'proposal.slave.openstack.org', 'proposal.slave.openstack.org',
'puppetdb.openstack.org', 'puppetdb.openstack.org',
'puppetmaster.openstack.org', 'puppetmaster.openstack.org',
'pypi.bhs1.openstack.org',
'pypi.dfw.openstack.org', 'pypi.dfw.openstack.org',
'pypi.gra1.openstack.org', 'pypi.gra1.openstack.org',
'pypi.iad.openstack.org', 'pypi.iad.openstack.org',

1
modules/openstack_project/manifests/server.pp
View File

@ -16,6 +16,7 @@ class openstack_project::server (
$manage_exim = true, $manage_exim = true,
$pypi_index_url = 'https://pypi.python.org/simple', $pypi_index_url = 'https://pypi.python.org/simple',
$pypi_trusted_hosts = [ $pypi_trusted_hosts = [
'pypi.bhs1.openstack.org',
'pypi.dfw.openstack.org', 'pypi.dfw.openstack.org',
'pypi.gra1.openstack.org', 'pypi.gra1.openstack.org',
'pypi.iad.openstack.org', 'pypi.iad.openstack.org',

1
modules/openstack_project/manifests/template.pp
View File

@ -20,6 +20,7 @@ class openstack_project::template (
$sysadmins = [], $sysadmins = [],
$pypi_index_url = 'https://pypi.python.org/simple', $pypi_index_url = 'https://pypi.python.org/simple',
$pypi_trusted_hosts = [ $pypi_trusted_hosts = [
'pypi.bhs1.openstack.org',
'pypi.dfw.openstack.org', 'pypi.dfw.openstack.org',
'pypi.gra1.openstack.org', 'pypi.gra1.openstack.org',
'pypi.iad.openstack.org', 'pypi.iad.openstack.org',

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

@ -20,7 +20,9 @@ clouds:
project_name: '<%= hpcloud_project %>' project_name: '<%= hpcloud_project %>'
ovh: ovh:
profile: ovh profile: ovh
region_name: GRA1 regions:
- BHS1
- GRA1
auth: auth:
username: '<%= ovh_username %>' username: '<%= ovh_username %>'
password: '<%= ovh_password %>' password: '<%= ovh_password %>'