openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "install_modules: allow to customize PUPPETFILE_DIR"

Browse Source
This commit is contained in:
Jenkins 2015-09-23 20:50:28 +00:00 committed by Gerrit Code Review
commit c9ab009ad0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install_modules.sh
View File

@ -7,7 +7,7 @@ if [ ! -z ${GEM_HOME} ]; then
fi fi
export SCRIPT_DIR=$(readlink -f "$(dirname $0)") export SCRIPT_DIR=$(readlink -f "$(dirname $0)")
export PUPPETFILE_DIR=/etc/puppet/modules export PUPPETFILE_DIR=${PUPPETFILE_DIR:-/etc/puppet/modules}
install_external() { install_external() {
PUPPETFILE=${SCRIPT_DIR}/Puppetfile1 ${GEM_BIN_DIR}r10k puppetfile install -v PUPPETFILE=${SCRIPT_DIR}/Puppetfile1 ${GEM_BIN_DIR}r10k puppetfile install -v
@ -17,7 +17,7 @@ install_openstack() {
cat > clonemap.yaml <<EOF cat > clonemap.yaml <<EOF
clonemap: clonemap:
- name: '(.*?)/puppet-(.*)' - name: '(.*?)/puppet-(.*)'
dest: '/etc/puppet/modules/\2' dest: '$PUPPETFILE_DIR/\2'
EOF EOF
local project_names=$(awk '{ if ($1 == ":git") print $3 }' \ local project_names=$(awk '{ if ($1 == ":git") print $3 }' \