sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Make RHSM registration set -u safe"

Browse source
This commit is contained in:
Jenkins 2014-08-28 15:36:46 +00:00 committed by Gerrit Code Review
commit 06f7f40028
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
elements/rhel-common/pre-install.d/00-rhsm
View file

@ -5,29 +5,29 @@ set -o pipefail
export DIB_RHSM_USER=${DIB_RHSM_USER:-} export DIB_RHSM_USER=${DIB_RHSM_USER:-}
if [ -n "$DIB_RHSM_USER" ] && [ -n "$DIB_RHSM_PASSWORD" ] ; then if [ -n "${DIB_RHSM_USER:-}" ] && [ -n "${DIB_RHSM_PASSWORD:-}" ] ; then
opts="--force" opts="--force"
if [[ -n "$DIB_SAT_KEY" ]]; then if [[ -n "${DIB_SAT_KEY:-}" ]]; then
opts="$opts --activationkey ${DIB_SAT_KEY}" opts="$opts --activationkey ${DIB_SAT_KEY}"
else else
opts="$opts --username ${DIB_RHSM_USER} --password ${DIB_RHSM_PASSWORD}" opts="$opts --username ${DIB_RHSM_USER} --password ${DIB_RHSM_PASSWORD}"
fi fi
if [[ -n "$DIB_SAT_URL" ]]; then if [[ -n "${DIB_SAT_URL:-}" ]]; then
if [[ "$DIB_REG_TYPE" == "rhn" ]]; then if [[ "${DIB_REG_TYPE:-}" == "rhn" ]]; then
opts="$opts --serverUrl ${DIB_SAT_URL}" opts="$opts --serverUrl ${DIB_SAT_URL}"
else else
opts="$opts --serverurl ${DIB_SAT_URL} --sslCACert /usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT" opts="$opts --serverurl ${DIB_SAT_URL} --sslCACert /usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT"
fi fi
fi fi
if [[ -n "$DIB_SAT_CERT_RPM_URL" ]]; then if [[ -n "${DIB_SAT_CERT_RPM_URL:-}" ]]; then
yum install -y ${DIB_SAT_CERT_RPM_URL} yum install -y ${DIB_SAT_CERT_RPM_URL}
fi fi
if [[ "$DIB_REG_TYPE" == "rhn" ]]; then if [[ "${DIB_REG_TYPE:-}" == "rhn" ]]; then
rhnreg_ks $opts --norhnsd rhnreg_ks $opts --norhnsd
sleep 1 sleep 1
# optional channel required for diskimage-builder dependency # optional channel required for diskimage-builder dependency
channels="-a -c rhel-x86_64-server-optional-6" channels="-a -c rhel-x86_64-server-optional-6"
if [[ -n "$DIB_RHN_CHANNELS" ]]; then if [[ -n "${DIB_RHN_CHANNELS:-}" ]]; then
for chan in $DIB_RHN_CHANNELS; do for chan in $DIB_RHN_CHANNELS; do
channels="$channels -a -c $chan" channels="$channels -a -c $chan"
done done
@ -38,7 +38,7 @@ if [ -n "$DIB_RHSM_USER" ] && [ -n "$DIB_RHSM_PASSWORD" ] ; then
subscription-manager register $opts subscription-manager register $opts
# wait a second to ensure consumer certificate is finished writing to disk # wait a second to ensure consumer certificate is finished writing to disk
sleep 1 sleep 1
if [ -z $DIB_RHSM_POOL ]; then if [ -z ${DIB_RHSM_POOL:-} ]; then
subscription-manager attach --auto subscription-manager attach --auto
else else
subscription-manager attach --pool $DIB_RHSM_POOL subscription-manager attach --pool $DIB_RHSM_POOL
@ -49,7 +49,7 @@ if [ -n "$DIB_RHSM_USER" ] && [ -n "$DIB_RHSM_PASSWORD" ] ; then
else else
repos="--enable rhel-6-server-optional-rpms" repos="--enable rhel-6-server-optional-rpms"
fi fi
if [[ -n "$DIB_RHSM_REPOS" ]]; then if [[ -n "${DIB_RHSM_REPOS:-}" ]]; then
for repo in $DIB_RHSM_REPOS; do for repo in $DIB_RHSM_REPOS; do
repos="$repos --enable $repo" repos="$repos --enable $repo"
done done