opendev/system-config
Code Issues Proposed changes

Handle moved puppet repos

Browse Source 
As per [1], it seems puppet has "cleaned up" most of the packages we
are using to install.

Install the puppet-agent packages directly as puppet's archive location
is not a valid repo. With puppet 4 at least these packages should bundle
everything we need including ruby.

[1] https://groups.google.com/forum/#!msg/puppet-users/cCsGWKunBe4/OdG0T7LeDAAJ

Depends-On: https://review.opendev.org/659384
Depends-On: https://review.opendev.org/659395
Change-Id: Ie9e2b79b42f397bddd960ccdc303b536155ce123
This commit is contained in:
Ian Wienand
2019-05-15 16:31:22 +10:00
committed by Clark Boylan
parent d968256e89
commit d5b321b074
7 changed files with 39 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/prep-apply.sh
View File

@@ -40,8 +40,15 @@ declare -A INTEGRATION_MODULES
source $MODULE_ENV_FILE
virtualenv --system-site-packages /tmp/apply-ansible-env
/tmp/apply-ansible-env/bin/pip install ansible
# Install puppet
SETUP_PIP=false sudo -E bash -x $ROOT/install_puppet.sh
inv=`mktemp`
cat > $inv <<EOF
localhost ansible_connection=local
EOF
sudo -H ANSIBLE_ROLES_PATH=$ROOT/roles /tmp/apply-ansible-env/bin/ansible-playbook -i $inv -e "{\"puppet_install_version\":$PUPPET_VERSION}" $ROOT/playbooks/install_puppet.yaml
rm $inv
if [ "$PUPPET_VERSION" == "3" ] ; then
export MODULE_PATH=/etc/puppet/modules
elif [ "$PUPPET_VERSION" == "4" ] ; then
@@ -90,5 +97,3 @@ sudo ln -sf $(pwd) /opt/system-config/production
sudo ln -sf /opt/system-config/production/modules/openstack_project $MODULE_PATH
sudo -H mkdir -p ~/.ansible/tmp
virtualenv --system-site-packages /tmp/apply-ansible-env
/tmp/apply-ansible-env/bin/pip install ansible