opendev/system-config
Code Issues Proposed changes

Bump puppetlabs-apt to 2.1.0

Browse Source 
This puppet-grafana requires 2.0.0 or later. So, we bump our version
to match.

Change-Id: Iaee167602523bc497515a31fdbea74728e94c55d
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2015-08-04 13:42:57 -04:00 committed by Spencer Krum
parent b593de8b0b
commit c43823e561
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules.env
View File

@ -46,7 +46,7 @@ SOURCE_MODULES["https://github.com/nanliu/puppet-staging"]="1.0.0"
SOURCE_MODULES["https://github.com/puppet-community/puppet-alternatives"]="0.3.0" SOURCE_MODULES["https://github.com/puppet-community/puppet-alternatives"]="0.3.0"
SOURCE_MODULES["https://github.com/puppet-community/puppet-archive"]="0.3.0" SOURCE_MODULES["https://github.com/puppet-community/puppet-archive"]="0.3.0"
SOURCE_MODULES["https://github.com/puppet-community/puppet-module-puppetboard"]="2.4.0" SOURCE_MODULES["https://github.com/puppet-community/puppet-module-puppetboard"]="2.4.0"
SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-apt"]="1.4.2" SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-apt"]="2.1.0"
SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-concat"]="1.1.0" SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-concat"]="1.1.0"
SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-firewall"]="1.1.3" SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-firewall"]="1.1.3"
SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-haproxy"]="0.4.1" SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-haproxy"]="0.4.1"

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

@ -304,10 +304,12 @@ class openstack_project::template (
# also seems that distro packages are recent enough # also seems that distro packages are recent enough
if ($::operatingsystemrelease != '15.04') { if ($::operatingsystemrelease != '15.04') {
apt::source { 'puppetlabs': apt::source { 'puppetlabs':
location => 'http://apt.puppetlabs.com', location => 'http://apt.puppetlabs.com',
repos => 'main', repos => 'main',
key => '4BD6EC30', key => {
key_server => 'pgp.mit.edu', 'id' =>'4BD6EC30',
'server' => 'pgp.mit.edu',
},
} }
} }