Merge "Add ability to manually install puppet modules"

Code Issues Proposed changes

This commit is contained in:

Jenkins

2016年02月17日 03:45:05 +00:00

committed by Gerrit Code Review

parent f135531556 bc818cbc65

commit 1a3506db20

1 changed files with 4 additions and 1 deletions

@@ -14,6 +14,7 @@

# under the License.

export SCENARIO=${SCENARIO:-scenario001}

export MANAGE_PUPPET_MODULES=${MANAGE_PUPPET_MODULES:-true}

export MANAGE_REPOS=${MANAGE_REPOS:-true}

export PUPPET_ARGS=${PUPPET_ARGS:-}

export SCRIPT_DIR=$(cd `dirname 0ドル` && pwd -P)

@@ -62,7 +63,9 @@ elif is_fedora; then

$SUDO yum install -y dstat puppet

fi

$SUDO ./install_modules.sh

if [ "${MANAGE_PUPPET_MODULES}" = true ]; then

$SUDO ./install_modules.sh

fi

# use dstat to monitor system activity during integration testing

if type "dstat" 2>/dev/null; then