From 56c1a29809638d56d2188a27dd913b33168e1812 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 28 Jan 2016 08:05:18 -0800 Subject: [PATCH] Remove trusted-hosts from pip.conf On our nodepool hosts, we write the entire pip.conf now, including the trusted-host line. We don't need it anywhere else, so drop it entirely. Change-Id: I48110556554560fb7ca3ddaeab57c26c8c442e26 Depends-On: Ie6743e2a8f95f95cea19a0dbe9fceaedbff8bf94 --- modules/openstack_project/manifests/server.pp | 19 ------------------- .../openstack_project/manifests/template.pp | 19 ------------------- 2 files changed, 38 deletions(-) diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp index 1989cda7bb..b75f7f5065 100644 --- a/modules/openstack_project/manifests/server.pp +++ b/modules/openstack_project/manifests/server.pp @@ -16,24 +16,6 @@ class openstack_project::server ( $puppetmaster_server = 'puppetmaster.openstack.org', $manage_exim = true, $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': iptables_public_tcp_ports => $iptables_public_tcp_ports, @@ -50,7 +32,6 @@ class openstack_project::server ( manage_exim => $manage_exim, sysadmins => $sysadmins, pypi_index_url => $pypi_index_url, - pypi_trusted_hosts => $pypi_trusted_hosts, purge_apt_sources => true, } } diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp index bba0f5f1a9..2c1236eae3 100644 --- a/modules/openstack_project/manifests/template.pp +++ b/modules/openstack_project/manifests/template.pp @@ -20,24 +20,6 @@ class openstack_project::template ( $manage_exim = false, $sysadmins = [], $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, ) { @@ -241,7 +223,6 @@ class openstack_project::template ( $desired_virtualenv = '13.1.0' class { '::pip': index_url => $pypi_index_url, - trusted_hosts => $pypi_trusted_hosts, optional_settings => { 'extra-index-url' => '', },