Updated Branches: refs/heads/master 6507055ba -> 0661f9b81
Added fix to force apt to do a "apt-get update" before packages are installed. Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0661f9b8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0661f9b8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0661f9b8 Branch: refs/heads/master Commit: 0661f9b814fe3663f207a5c7960b746529ac3295 Parents: 6507055 Author: James Martin <[email protected]> Authored: Sat Dec 15 13:07:32 2012 -0500 Committer: Rohit Yadav <[email protected]> Committed: Sun Dec 16 12:29:49 2012 -0800 ---------------------------------------------------------------------- .../modules/devcloudinitial/manifests/init.pp | 20 ++++++++++---- .../src/puppet/modules/devcloud/manifests/init.pp | 7 +++- 2 files changed, 19 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0661f9b8/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp ---------------------------------------------------------------------- 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 8ceb39c..ee58a71 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; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0661f9b8/tools/devcloud/src/puppet/modules/devcloud/manifests/init.pp ---------------------------------------------------------------------- diff --git a/tools/devcloud/src/puppet/modules/devcloud/manifests/init.pp b/tools/devcloud/src/puppet/modules/devcloud/manifests/init.pp index 86ef72f..260e254 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/"],
