install_modules: allow to customize PUPPETFILE_DIR
Allow to change PUPPETFILE_DIR but keep '/etc/puppet/modules' by default. Change-Id: Ie32d18d477c271b2724290edbbfd4ae7ea110480
This commit is contained in:
parent
cf94ca50af
commit
cf6a377977
@ -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 }' \
|
||||||
|
Loading…
Reference in New Issue
Block a user