Correct rhel-common for rhel6

Hardcoding subscription-manager to use rhel-7-server-rpms causes
users building rhel6 with Satellite6 to fail. This setting cannot
be overridden with environment variables, therefore needs to be
smarter. Setting RHEL_MAJ_VER in the rhel/rhel7 environment fixes.

Change-Id: Ifbd88bc76ef8b38a739272ba6e045a12849d68df
Closes-Bug: 1404364

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

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

elements/rhel-common/pre-install.d/00-rhel-registration

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

elements/rhel/environment.d/10-rhel-distro-name.bash

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

elements/rhel7/environment.d/10-rhel7-distro-name.bash

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