openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Rework r10k verbose option"

Browse Source
This commit is contained in:
Jenkins 2017-08-15 19:15:35 +00:00 committed by Gerrit Code Review
commit c0ed51a9d9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions
View File

@ -9,7 +9,7 @@
# - ``SCRIPT_DIR`` must be set to script path # - ``SCRIPT_DIR`` must be set to script path
# - ``GEM_BIN_DIR`` must be set to Gem bin directory # - ``GEM_BIN_DIR`` must be set to Gem bin directory
install_external() { install_external() {
PUPPETFILE=${SCRIPT_DIR}/Puppetfile1 r10k puppetfile install -v PUPPETFILE=${SCRIPT_DIR}/Puppetfile1 r10k -v DEBUG puppetfile install
} }
# Install Puppet OpenStack modules with zuul-cloner # Install Puppet OpenStack modules with zuul-cloner
@ -54,7 +54,7 @@ EOF
install_all() { install_all() {
# When installing from local source, we want to install the current source # When installing from local source, we want to install the current source
# we're working from. # we're working from.
PUPPETFILE=${SCRIPT_DIR}/Puppetfile r10k puppetfile install -v PUPPETFILE=${SCRIPT_DIR}/Puppetfile r10k -v DEBUG puppetfile install
cp -a ${SCRIPT_DIR} ${PUPPETFILE_DIR}/openstack_integration cp -a ${SCRIPT_DIR} ${PUPPETFILE_DIR}/openstack_integration
} }