From 7d003b8f68abfb13434d04ec13257fae4a10e28d Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Tue, 5 Mar 2013 11:20:00 -0500 Subject: [PATCH] Add update_pkg_list_cmd to openstack_project. Add a new update_pkg_list_cmd parameter to the openstack_project module so we can control what each distribution runs to update package lists. On Ubuntu we want to run 'apt-get update' and on RHEL we want to run nothing since yum does this automatically. Change-Id: Iab08930bac5f992711b05bcbfa23b7daab12a060 Reviewed-on: https://review.openstack.org/23571 Reviewed-by: Jeremy Stanley Reviewed-by: Clark Boylan Approved: Jeremy Stanley Tested-by: Jenkins --- modules/openstack_project/manifests/params.pp | 2 ++ modules/openstack_project/manifests/puppet_cron.pp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/openstack_project/manifests/params.pp b/modules/openstack_project/manifests/params.pp index 70240c14c7..345e6d1628 100644 --- a/modules/openstack_project/manifests/params.pp +++ b/modules/openstack_project/manifests/params.pp @@ -7,10 +7,12 @@ class openstack_project::params { 'Redhat': { $packages = ['puppet', 'python-setuptools', 'wget'] $user_packages = ['byobu', 'emacs-nox'] + $update_pkg_list_cmd = '' } 'Debian', 'Ubuntu': { $packages = ['puppet', 'python-setuptools', 'wget'] $user_packages = ['byobu', 'emacs23-nox'] + $update_pkg_list_cmd = 'apt-get update >/dev/null 2>&1;' } default: { fail("Unsupported osfamily: ${::osfamily} The 'openstack_project' module only supports osfamily Ubuntu or Redhat(slaves only).") diff --git a/modules/openstack_project/manifests/puppet_cron.pp b/modules/openstack_project/manifests/puppet_cron.pp index 5ed8a99ddd..2fa0bed039 100644 --- a/modules/openstack_project/manifests/puppet_cron.pp +++ b/modules/openstack_project/manifests/puppet_cron.pp @@ -11,7 +11,7 @@ class openstack_project::puppet_cron($ensure = present) ensure => $ensure, user => 'root', minute => '*/15', - command => 'apt-get update >/dev/null 2>&1 ; sleep $((RANDOM\%600)) && puppet agent --test >>/var/log/manifest.log', + command => "${::openstack_project::params::update_pkg_list_cmd}sleep $((RANDOM\%600)) && puppet agent --test >>/var/log/manifest.log", environment => 'PATH=/var/lib/gems/1.8/bin:/usr/bin:/bin:/usr/sbin:/sbin', } logrotate::file { 'updatepuppet':