opendev/system-config
Code Issues Proposed changes

Merge "Update install_modules to not need puppet"

Browse Source
This commit is contained in:
Zuul 2018-08-07 22:43:29 +00:00 committed by Gerrit Code Review
commit a376c9ad6e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
install_modules.sh
View File

@ -15,7 +15,8 @@
# under the License.
function puppet_version {
PATH=/opt/puppetlabs/bin:$PATH puppet --version | cut -d '.' -f 1
# Default to 3 for the cases, like bridge, where there is no puppet
(PATH=/opt/puppetlabs/bin:$PATH puppet --version || echo 3) | cut -d '.' -f 1
}
export PUPPET_VERSION=$(puppet_version)
@ -83,7 +84,7 @@ if [ -z "${!MODULES[*]}" ] && [ -z "${!SOURCE_MODULES[*]}" ] ; then
exit 0
fi
MODULE_LIST=`PATH=$PATH:/opt/puppetlabs/bin puppet module list --color=false`
MODULE_LIST=$(find $MODULE_PATH -maxdepth 1 -mindepth 1 -printf '%f\n')
# Install modules from source
for MOD in ${!SOURCE_MODULES[*]} ; do