openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Rework r10k verbose option 

The command "r10k puppetfile install -v" fails with:
Unrecognized options: verbose.

Rework the command to be compatible with the r10k 1.1.4.

Closes-bug: #1707629

Change-Id: I05d888125284d2808fb248e52afc95ab2b948353
Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>
(cherry picked from commit 885abd1ae0)
This commit is contained in:
Bogdan Dobrelya 2017-07-31 12:49:14 +02:00 committed by Mohammed Naser
parent d1cc2198b0
commit a1975debf9
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
# - ``GEM_BIN_DIR`` must be set to Gem bin directory
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
@ -62,7 +62,7 @@ EOF
install_all() {
# When installing from local source, we want to install the current source
# 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
}