97c01e48ed
Currently we have all our elements and library files in a top-level directory and install them into <root>/share/diskimage-builder/[elements|lib] (where root is either / or the root of a virtualenv). The problem with this is that editable/development installs (pip -e) do *not* install data_files. Thus we have no canonical location to look for elements -- leading to the various odd things we do such as a whole bunch of guessing at the top of disk-image-create and having a special test-loader in tests/test_elements.py so we can run python unit tests on those elements that have it. data_files is really the wrong thing to use for what are essentially assets of the program. data_files install works well for things like config-files, init.d files or dropping documentation files. By moving the elements under the diskimage_builder package, we always know where they are relative to where we import from. In fact, pkg_resources has an api for this which we wrap in the new diskimage_builder/paths.py helper [1]. We use this helper to find the correct path in the couple of places we need to find the base-elements dir, and for the paths to import the library shell functions. Elements such as svc-map and pkg-map include python unit-tests, which we do not need tests/test_elements.py to special-case load any more. They just get found automatically by the normal subunit loader. I have a follow-on change (I69ca3d26fede0506a6353c077c69f735c8d84d28) to move disk-image-create to a regular python entry-point. Unfortunately, this has to move to work with setuptools. You'd think a symlink under diskimage_builder/[elements|lib] would work, but it doesn't. [1] this API handles stuff like getting files out of .zip archive modules, which we don't do. Essentially for us it's returning __file__. Change-Id: I5e3e3c97f385b1a4ff2031a161a55b231895df5b
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
|