opendev/system-config
Code Issues Proposed changes

Merge "List PyPI mirrors as trusted hosts everywhere"

Browse Source
This commit is contained in:
Jenkins 2015-01-26 16:02:30 +00:00 committed by Gerrit Code Review
commit bbb11cf0d6
2 changed files with 13 additions and 1 deletions
modules/openstack_project
files
pip.conf
manifests
base.pp

7
modules/openstack_project/files/pip.conf

@ -1,2 +1,7 @@
[global] [global]
index-url = http://pypi.dfw.openstack.org/simple index-url = https://pypi.python.org/simple
trusted-host =
pypi.dfw.openstack.org
pypi.iad.openstack.org
pypi.ord.openstack.org
pypi.region-b.geo-1.openstack.org

7
modules/openstack_project/manifests/base.pp

@ -72,6 +72,13 @@ class openstack_project::base(
provider => pip, provider => pip,
require => Class['pip'], require => Class['pip'],
} }
file { '/etc/pip.conf':
owner => 'root',
group => 'root',
mode => '0444',
source => 'puppet:///modules/openstack_project/pip.conf',
replace => true,
}
if ($install_users) { if ($install_users) {
package { $::openstack_project::params::user_packages: package { $::openstack_project::params::user_packages: