opendev/system-config
Code Issues Proposed changes

Merge "Fix acceptance test setup script for puppet 4"

Browse Source
This commit is contained in:
Zuul 2018-06-22 02:18:31 +00:00 committed by Gerrit Code Review
commit 905fd9cfd5
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/install_modules_acceptance.sh
View File

@ -27,7 +27,6 @@
# in a zuul environment or not. # in a zuul environment or not.
ROOT=$(readlink -fn $(dirname $0)/..) ROOT=$(readlink -fn $(dirname $0)/..)
MODULE_PATH="${ROOT}/modules:/etc/puppet/modules"
# These arrays are initialized here and populated in modules.env # These arrays are initialized here and populated in modules.env
@ -47,12 +46,19 @@ install_external() {
} }
install_openstack() { install_openstack() {
local modulepath
if [ "$PUPPET_VERSION" == "3" ] ; then
modulepath='/etc/puppet/modules'
else
modulepath='/etc/puppetlabs/code/modules'
fi
cat > clonemap.yaml <<EOF cat > clonemap.yaml <<EOF
clonemap: clonemap:
- name: openstack-infra/project-config - name: openstack-infra/project-config
dest: /etc/project-config dest: /etc/project-config
- name: '(.*?)/puppet-(.*)' - name: '(.*?)/puppet-(.*)'
dest: '/etc/puppet/modules/\2' dest: '$modulepath/\2'
EOF EOF
project_names="" project_names=""