opendev/system-config
Code Issues Proposed changes

Merge "Add path to installing puppet 3 on nodepool nodes"

Browse Source
This commit is contained in:
Jenkins 2014-08-03 20:22:53 +00:00 committed by Gerrit Code Review
commit 43b37d12f5
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
install_puppet.sh
View File

@ -23,7 +23,8 @@
# #
# Test condition to install puppet 3 # Test condition to install puppet 3
if [ "$1" = '--three' ]; then PUPPET_VERSION=${PUPPET_VERSION:-2}
if [ "$PUPPET_VERSION" = '3' ]; then
THREE=yes THREE=yes
echo "Running in 3 mode" echo "Running in 3 mode"
fi fi

2
modules/openstack_project/files/nodepool/scripts/prepare_node.sh
View File

@ -25,6 +25,8 @@ PYPY=${PYPY:-false}
ALL_MYSQL_PRIVS=${ALL_MYSQL_PRIVS:-false} ALL_MYSQL_PRIVS=${ALL_MYSQL_PRIVS:-false}
GIT_BASE=${GIT_BASE:-git://git.openstack.org} GIT_BASE=${GIT_BASE:-git://git.openstack.org}
export PUPPET_VERSION=${PUPPET_VERSION:-'2'}
# Save the nameservers configured by our provider. # Save the nameservers configured by our provider.
cat >/tmp/forwarding.conf <<EOF cat >/tmp/forwarding.conf <<EOF
forward-zone: forward-zone: