Use our custom pip provider for keyring package

The pip provider in puppet hard-codes pypi.python.org in the 'latest'
method[1]. This is a problem because it bypasses our mirrors and causes
intermittent CI failures across all the puppet modules. This patch
changes the keyring package resource to use our new 'openstack_pip'
package provider[2], which uses the pip command line tool to check for
the latest version of a package, thereby using all the configs set in
/etc/pip.conf.

This change requires downstream users to install the puppet-pip module.

[1] https://github.com/puppetlabs/puppet/blob/3.8.6/lib/puppet/provider/package/pip.rb#L69
[2] https://review.openstack.org/#/c/302396/

Change-Id: I91d87487c358c247bd12c976f50a2d0f8d785cf5
This commit is contained in:
Colleen Murphy
2016-04-13 14:45:26 -07:00
parent 68390bd535
commit db3ce60872
2 changed files with 3 additions and 2 deletions

View File

@@ -105,7 +105,7 @@ class openstackci::logserver (
package { 'keyring':
ensure => 'latest',
provider => 'pip',
provider => 'openstack_pip',
}
vcsrepo { '/opt/os-loganalyze':

View File

@@ -17,6 +17,7 @@
{ "name": "openstackinfra/simpleproxy" },
{ "name": "openstackinfra/subunit2sql" },
{ "name": "openstackinfra/logstash" },
{ "name": "openstackinfra/elasticsearch" }
{ "name": "openstackinfra/elasticsearch" },
{ "name": "openstackinfra/pip" }
]
}