opendev/system-config
Code Issues Proposed changes

Merge "Remove trusted-hosts from pip.conf"

Browse Source
This commit is contained in:
Jenkins 2016-02-05 14:07:55 +00:00 committed by Gerrit Code Review
commit d7580c8bcf
2 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,24 +16,6 @@ class openstack_project::server (
$puppetmaster_server = 'puppetmaster.openstack.org', $puppetmaster_server = 'puppetmaster.openstack.org',
$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.bhs1.openstack.org',
'pypi.dfw.openstack.org',
'pypi.gra1.openstack.org',
'pypi.iad.openstack.org',
'pypi.nyj01.openstack.org',
'pypi.ord.openstack.org',
'pypi.region-b.geo-1.openstack.org',
'pypi.regionone.openstack.org',
'mirror.bhs1.ovh.openstack.org',
'mirror.dfw.rax.openstack.org',
'mirror.gra1.ovh.openstack.org',
'mirror.iad.rax.openstack.org',
'mirror.nyj01.internap.openstack.org',
'mirror.ord.rax.openstack.org',
'mirror.region-b.geo-1.hpcloud.openstack.org',
'mirror.regionone.bluebox-sjc1.openstack.org',
],
) { ) {
class { 'openstack_project::template': class { 'openstack_project::template':
iptables_public_tcp_ports => $iptables_public_tcp_ports, iptables_public_tcp_ports => $iptables_public_tcp_ports,
@ -50,7 +32,6 @@ class openstack_project::server (
manage_exim => $manage_exim, manage_exim => $manage_exim,
sysadmins => $sysadmins, sysadmins => $sysadmins,
pypi_index_url => $pypi_index_url, pypi_index_url => $pypi_index_url,
pypi_trusted_hosts => $pypi_trusted_hosts,
purge_apt_sources => true, purge_apt_sources => true,
} }
} }

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

@ -20,24 +20,6 @@ class openstack_project::template (
$manage_exim = false, $manage_exim = false,
$sysadmins = [], $sysadmins = [],
$pypi_index_url = 'https://pypi.python.org/simple', $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',
'pypi.nyj01.openstack.org',
'pypi.ord.openstack.org',
'pypi.region-b.geo-1.openstack.org',
'pypi.regionone.openstack.org',
'mirror.bhs1.ovh.openstack.org',
'mirror.dfw.rax.openstack.org',
'mirror.gra1.ovh.openstack.org',
'mirror.iad.rax.openstack.org',
'mirror.nyj01.internap.openstack.org',
'mirror.ord.rax.openstack.org',
'mirror.region-b.geo-1.hpcloud.openstack.org',
'mirror.regionone.bluebox-sjc1.openstack.org',
],
$purge_apt_sources = false, $purge_apt_sources = false,
) { ) {
@ -241,7 +223,6 @@ class openstack_project::template (
$desired_virtualenv = '13.1.0' $desired_virtualenv = '13.1.0'
class { '::pip': class { '::pip':
index_url => $pypi_index_url, index_url => $pypi_index_url,
trusted_hosts => $pypi_trusted_hosts,
optional_settings => { optional_settings => {
'extra-index-url' => '', 'extra-index-url' => '',
}, },