b9b510ba6a
* manifests/site.pp: Pass both jenkins.openstack.org and jenkins-dev.openstack.org to openstack_project::zuul as the list of gearman workers for use in iptables rules. * modules/openstack_project/manifests/jenkins.pp * modules/openstack_project/manifests/jenkins_dev.pp: Remove unused 4155/tcp from public allowed ports list, previously for a bzr service which is no longer running on these servers. * modules/openstack_project/manifests/zuul.pp: Add iptables rules allowing access from gearman workers to the gearmand, and also configure gearmand to listen on all addresses including IPv6, as opposed to its IPv4-only default. * install_modules.sh: Add puppetlabs-stdlib version 3.2.0 to the list of puppet dependencies. This is required to pull in the "flatten" function used in zuul.pp above. Change-Id: I05d4abc92b3050884a7e9f3c2b6cd9dcc81bfa36 Reviewed-on: https://review.openstack.org/26245 Reviewed-by: James E. Blair <corvus@inaugust.com> Reviewed-by: Jeremy Stanley <fungi@yuggoth.org> Approved: Jeremy Stanley <fungi@yuggoth.org> Tested-by: Jenkins
56 lines
1.8 KiB
Bash
Executable File
56 lines
1.8 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
MODULE_PATH=/etc/puppet/modules
|
|
|
|
# Array of modules to be installed key:value is module:version.
|
|
declare -A MODULES
|
|
#NOTE: if we previously installed kickstandproject-ntp we nuke it here
|
|
# since puppetlabs-ntp and kickstandproject-ntp install to the same dir
|
|
if grep kickstandproject-ntp /etc/puppet/modules/ntp/Modulefile &> /dev/null; then
|
|
rm -Rf "/etc/puppet/modules/ntp"
|
|
fi
|
|
MODULES["puppetlabs-ntp"]="0.2.0"
|
|
|
|
MODULES["openstackci-dashboard"]="0.0.8"
|
|
|
|
# freenode #puppet 2012-09-25:
|
|
# 18:25 < jeblair> i would like to use some code that someone wrote,
|
|
# but it's important that i understand how the author wants me to use
|
|
# it...
|
|
# 18:25 < jeblair> in the case of the vcsrepo module, there is
|
|
# ambiguity, and so we are trying to determine what the author(s)
|
|
# intent is
|
|
# 18:30 < jamesturnbull> jeblair: since we - being PL - are the author
|
|
# - our intent was not to limit it's use and it should be Apache
|
|
# licensed
|
|
MODULES["openstackci-vcsrepo"]="0.0.8"
|
|
|
|
MODULES["puppetlabs-apache"]="0.0.4"
|
|
MODULES["puppetlabs-apt"]="1.1.0"
|
|
MODULES["puppetlabs-mysql"]="0.5.0"
|
|
MODULES["puppetlabs-postgresql"]="2.0.1"
|
|
MODULES["puppetlabs-stdlib"]="3.2.0"
|
|
MODULES["saz-memcached"]="2.0.2"
|
|
MODULES["saz-gearman"]="2.0.1"
|
|
|
|
MODULE_LIST=`puppet module list`
|
|
|
|
# Transition away from old things
|
|
if [ -d /etc/puppet/modules/vcsrepo/.git ]
|
|
then
|
|
rm -rf /etc/puppet/modules/vcsrepo
|
|
fi
|
|
|
|
for MOD in ${!MODULES[*]} ; do
|
|
# If the module at the current version does not exist upgrade or install it.
|
|
if ! echo $MODULE_LIST | grep "$MOD ([^v]*v${MODULES[$MOD]}" >/dev/null 2>&1
|
|
then
|
|
# Attempt module upgrade. If that fails try installing the module.
|
|
if ! puppet module upgrade $MOD --version ${MODULES[$MOD]} >/dev/null 2>&1
|
|
then
|
|
# This will get run in cron, so silence non-error output
|
|
puppet module install $MOD --version ${MODULES[$MOD]} >/dev/null
|
|
fi
|
|
fi
|
|
done
|