Merge "Always apt-get update after replacing sources"

This commit is contained in:
Jenkins 2016-05-10 16:02:32 +00:00 committed by Gerrit Code Review
commit 22d3a38c8d

@ -190,7 +190,8 @@ class openstack_project::template (
case $::osfamily {
'Debian': {
# Purge and augment existing /etc/apt/sources.list if requested
# Purge and augment existing /etc/apt/sources.list if requested, and make
# sure apt-get update is run before any packages are installed
class { '::apt':
purge => { 'sources.list' => $purge_apt_sources }
}
@ -202,6 +203,13 @@ class openstack_project::template (
owner => 'root',
source => "puppet:///modules/openstack_project/sources.list.${::lsbdistcodename}",
}
exec { 'update-apt':
command => 'apt-get update',
refreshonly => true,
path => '/bin:/usr/bin',
subscribe => File['/etc/apt/sources.list.d/openstack-infra.list'],
}
Exec['update-apt'] -> Package <| |>
}
# Make sure dig is installed