opendev/system-config
Code Issues Proposed changes

Drop the saz-gearman module (we don't use it)

Browse Source 
This module confused me in that I though we were actually
using gearmand somewhere. Infra has its own version of
gearman fork in python... so no need to keep this around anymore.

This change adds a new remove_module function to install_modules.sh
and updates the script to use that function to remove gearman
and the associated dependency modules.

Change-Id: Ifc3808407eba9853b6991ef9744adb96453d46a8
This commit is contained in:
Dan Prince 2013-11-20 16:13:58 -05:00
parent 01fe13573e
commit 0f445410ce
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
install_modules.sh
View File

@ -2,13 +2,26 @@
MODULE_PATH=/etc/puppet/modules MODULE_PATH=/etc/puppet/modules
function remove_module {
local SHORT_MODULE_NAME=$1
if [ -n "$SHORT_MODULE_NAME" ]; then
rm -Rf "$MODULE_PATH/$SHORT_MODULE_NAME"
else
echo "ERROR: remove_module requires a SHORT_MODULE_NAME."
fi
}
# Array of modules to be installed key:value is module:version. # Array of modules to be installed key:value is module:version.
declare -A MODULES declare -A MODULES
#NOTE: if we previously installed kickstandproject-ntp we nuke it here #NOTE: if we previously installed kickstandproject-ntp we nuke it here
# since puppetlabs-ntp and kickstandproject-ntp install to the same dir # since puppetlabs-ntp and kickstandproject-ntp install to the same dir
if grep kickstandproject-ntp /etc/puppet/modules/ntp/Modulefile &> /dev/null; then if grep kickstandproject-ntp /etc/puppet/modules/ntp/Modulefile &> /dev/null; then
rm -Rf "/etc/puppet/modules/ntp" remove_module "ntp"
fi fi
remove_module "gearman" #remove old saz-gearman
remove_module "limits" # remove saz-limits (required by saz-gearman)
MODULES["puppetlabs-ntp"]="0.2.0" MODULES["puppetlabs-ntp"]="0.2.0"
MODULES["openstackci-dashboard"]="0.0.8" MODULES["openstackci-dashboard"]="0.0.8"
@ -32,7 +45,6 @@ MODULES["puppetlabs-mysql"]="0.6.1"
MODULES["puppetlabs-postgresql"]="3.0.0" MODULES["puppetlabs-postgresql"]="3.0.0"
MODULES["puppetlabs-stdlib"]="3.2.0" MODULES["puppetlabs-stdlib"]="3.2.0"
MODULES["saz-memcached"]="2.0.2" MODULES["saz-memcached"]="2.0.2"
MODULES["saz-gearman"]="2.0.1"
MODULES["spiette-selinux"]="0.5.1" MODULES["spiette-selinux"]="0.5.1"
MODULES["rafaelfc-pear"]="1.0.3" MODULES["rafaelfc-pear"]="1.0.3"