From 680a6ab2ace89623bd00895e69ef2cb7d3a7e852 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 18 Dec 2014 08:14:18 -0500 Subject: [PATCH] List PyPI mirrors as trusted hosts everywhere Upcoming versions of pip are going to get more and more nasty about non-SSL index locations. In order to deal with that well, add a global config file listing our PyPI mirrors as "trusted" - which means that pip will not complain about their non-SSL qualities. Change-Id: If9f3cec10d8057631978f7f1d5cd7e4936e163ef --- modules/openstack_project/files/pip.conf | 7 ++++++- modules/openstack_project/manifests/base.pp | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/openstack_project/files/pip.conf b/modules/openstack_project/files/pip.conf index 56fc14b1ff..70e5de85b7 100644 --- a/modules/openstack_project/files/pip.conf +++ b/modules/openstack_project/files/pip.conf @@ -1,2 +1,7 @@ [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 diff --git a/modules/openstack_project/manifests/base.pp b/modules/openstack_project/manifests/base.pp index bc9b082524..34f66946db 100644 --- a/modules/openstack_project/manifests/base.pp +++ b/modules/openstack_project/manifests/base.pp @@ -72,6 +72,13 @@ class openstack_project::base( provider => 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) { package { $::openstack_project::params::user_packages: