36b59c001c
There is a wide variety of tracing options through the various shell
scripts. Some use "set -eux", others explicity set xtrace and others
do nothing. There is a "-x" option to bin/disk-image-create but it
doesn't flow down to the many scripts it calls.
This adds a global integer variable set by disk-image-create
DIB_DEBUG_TRACE. All scripts have a stanza added to detect this and
turn on tracing. Any other tracing methods are rolled into this. So
the standard header is
---
if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
set -x
fi
set -eu
set -o pipefail
---
Multiple -x options can be specified to dib-create-image, which
increases the value of DIB_DEBUG_TRACE. If script authors feel their
script should only trace at higher levels, they should modify the
"-gt" value. If they feel it should trace by default, they can modify
the default value also.
Changes to pachset 16 : scripts which currently trace themselves by
default have retained this behaviour with DIB_DEBUG_TRACE defaulting
to "1". This was done by running [1] on patch set 15. See the thread
beginning at [2]
dib-lint is also updated to look for the variable being matched.
[1] https://gist.github.com/ianw/71bbda9e6acc74ccd0fd
[2] http://lists.openstack.org/pipermail/openstack-dev/2014-November/051575.html
Change-Id: I6c5a962260741dcf6f89da9a33b96372a719b7b0
67 lines
2.3 KiB
Bash
Executable File
67 lines
2.3 KiB
Bash
Executable File
#!/bin/bash
|
|
# This script is for RHEL6 use only. For RHEL7, please see the readme for
|
|
# documentation on which scripts are used for registration and the variables
|
|
# needed to enable the registration process.
|
|
|
|
if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
export DIB_RHSM_USER=${DIB_RHSM_USER:-}
|
|
|
|
if [ -n "${DIB_RHSM_USER:-}" ] && [ -n "${DIB_RHSM_PASSWORD:-}" ] ; then
|
|
opts="--force"
|
|
if [[ -n "${DIB_SAT_KEY:-}" ]]; then
|
|
opts="$opts --activationkey ${DIB_SAT_KEY}"
|
|
else
|
|
opts="$opts --username ${DIB_RHSM_USER} --password ${DIB_RHSM_PASSWORD}"
|
|
fi
|
|
if [[ -n "${DIB_SAT_URL:-}" ]]; then
|
|
if [[ "${DIB_REG_TYPE:-}" == "rhn" ]]; then
|
|
opts="$opts --serverUrl ${DIB_SAT_URL}"
|
|
else
|
|
opts="$opts --serverurl ${DIB_SAT_URL} --sslCACert /usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT"
|
|
fi
|
|
fi
|
|
if [[ -n "${DIB_SAT_CERT_RPM_URL:-}" ]]; then
|
|
yum install -y ${DIB_SAT_CERT_RPM_URL}
|
|
fi
|
|
if [[ "${DIB_REG_TYPE:-}" == "rhn" ]]; then
|
|
rhnreg_ks $opts --norhnsd
|
|
sleep 1
|
|
# optional channel required for diskimage-builder dependency
|
|
channels="-a -c rhel-x86_64-server-optional-6"
|
|
if [[ -n "${DIB_RHN_CHANNELS:-}" ]]; then
|
|
for chan in $DIB_RHN_CHANNELS; do
|
|
channels="$channels -a -c $chan"
|
|
done
|
|
fi
|
|
rhn-channel --user=$DIB_RHSM_USER --password=$DIB_RHSM_PASSWORD $channels
|
|
rhn-channel -l
|
|
else
|
|
subscription-manager register $opts
|
|
# wait a second to ensure consumer certificate is finished writing to disk
|
|
sleep 1
|
|
if [ -z ${DIB_RHSM_POOL:-} ]; then
|
|
subscription-manager attach --auto
|
|
else
|
|
subscription-manager attach --pool $DIB_RHSM_POOL
|
|
fi
|
|
# optional repo required for diskimage-builder dependency
|
|
if [ "$DISTRO_NAME" == "rhel7" ]; then
|
|
repos="--enable rhel-7-server-optional-rpms"
|
|
else
|
|
repos="--enable rhel-6-server-optional-rpms"
|
|
fi
|
|
if [[ -n "${DIB_RHSM_REPOS:-}" ]]; then
|
|
for repo in $DIB_RHSM_REPOS; do
|
|
repos="$repos --enable $repo"
|
|
done
|
|
fi
|
|
subscription-manager repos $repos
|
|
subscription-manager repos --list
|
|
fi
|
|
fi
|