sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Correct rhel-common for rhel6"

Browse Source 
This is breaking deployments that use registration.  I
believe os-refresh-config scripts don't source environment.d
files, so the variable is unset there.

Given that this a blocking issue for RHEL deployments, I'm
pushing a quick revert and we can come up with a proper fix
when this isn't stopping other work.

This reverts commit 71bd8b3a33.

Change-Id: I87504660352220d45f5445bb933edc1c28885fcb
This commit is contained in:
Ben Nemec 2016-02-17 22:17:11 +00:00
parent 71bd8b3a33
commit a342036e75
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration
View File

@ -31,8 +31,8 @@ REG_METHOD="$(os-apply-config --key rh_registration.method --type raw --key-defa
opts=
attach_opts=
repos="repos --enable rhel-${RHEL_MAJ_VER}-server-rpms"
satellite_repo="rhel-${RHEL_MAJ_VER}-server-rh-common-rpms"
repos="repos --enable rhel-7-server-rpms"
satellite_repo="rhel-7-server-rh-common-rpms"
if [ -n "${REG_AUTO_ATTACH:-}" ]; then
opts="$opts --auto-attach"

4
elements/rhel-common/pre-install.d/00-rhel-registration
View File

@ -9,8 +9,8 @@ set -o pipefail
opts=
attach_opts=
repos="repos --enable rhel-${RHEL_MAJ_VER}-server-rpms"
satellite_repo="rhel-${RHEL_MAJ_VER}-server-rh-common-rpms"
repos="repos --enable rhel-7-server-rpms"
satellite_repo="rhel-7-server-rh-common-rpms"
if [ -n "${REG_AUTO_ATTACH:-}" ]; then
opts="$opts --auto-attach"

1
elements/rhel/environment.d/10-rhel-distro-name.bash
View File

@ -1,2 +1 @@
export DISTRO_NAME=rhel
export RHEL_MAJ_VER=6

1
elements/rhel7/environment.d/10-rhel7-distro-name.bash
View File

@ -1,2 +1 @@
export DISTRO_NAME=rhel7
export RHEL_MAJ_VER=7