From 0661f9b814fe3663f207a5c7960b746529ac3295 Mon Sep 17 00:00:00 2001 From: James Martin Date: Sat, 15 Dec 2012 13:07:32 -0500 Subject: [PATCH] Added fix to force apt to do a "apt-get update" before packages are installed. Signed-off-by: Rohit Yadav --- .../modules/devcloudinitial/manifests/init.pp | 20 +++++++++++++------ .../puppet/modules/devcloud/manifests/init.pp | 7 +++++-- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp b/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp index 8ceb39c8d6a..ee58a71e837 100644 --- a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp +++ b/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp @@ -15,14 +15,22 @@ # specific language governing permissions and limitations # under the License. + class devcloudinitial { -if $::architecture == 'x86_64'{ - $debarch='amd64' -} -else { - $debarch='i386' -} + if $::architecture == 'x86_64'{ + $debarch='amd64' + } + else { + $debarch='i386' + } + + exec { "apt-update": + command => "/usr/bin/apt-get update" + } + + Exec["apt-update"] -> Package <| |> + package { "linux-headers-${::kernelrelease}": ensure => latest; diff --git a/tools/devcloud/src/puppet/modules/devcloud/manifests/init.pp b/tools/devcloud/src/puppet/modules/devcloud/manifests/init.pp index 86ef72fd16b..260e2542e01 100644 --- a/tools/devcloud/src/puppet/modules/devcloud/manifests/init.pp +++ b/tools/devcloud/src/puppet/modules/devcloud/manifests/init.pp @@ -16,7 +16,6 @@ # under the License. - class devcloud ( $cs_dir = $devcloud::params::cs_dir , @@ -38,9 +37,10 @@ class devcloud ( ) inherits devcloud::params { - Exec { path => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ] } + Exec["apt-update"] -> Package <| |> + service { 'ebtables': ensure => 'running', @@ -67,6 +67,9 @@ class devcloud ( exec { + 'apt-update': + command => '/usr/bin/apt-get update'; + 'get_md5sums': command => "/usr/bin/wget -N ${md5sum_remote} -O ${md5sum_local}", require => File["${storage_dir}/secondary/template/tmpl/1/"],