From 29fb53f95b7fec3d77d258e9236fba0b20dab1ce Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 31 Mar 2016 14:41:22 +0000 Subject: [PATCH] Always apt-get update after replacing sources To avoid an unfortunate bootstrapping race, make sure we always run `apt-get update` after replacing the sources list but before any packages are installed. Change-Id: I30b9cb3d6cbfa5df59dd1c1eef88bf486f96a52c --- modules/openstack_project/manifests/template.pp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp index 87e0a9357a..e94fb5d936 100644 --- a/modules/openstack_project/manifests/template.pp +++ b/modules/openstack_project/manifests/template.pp @@ -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