contrib/rhcs: update rhel7 container image

We now need to inherit from registry.redhat.io when using the rhel7
container image.
The rhel7 tag also changed from 7-released to latest.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 97db9ff)

contrib/commit-rhcs.sh

@@ -50,7 +50,7 @@ pushd "$CEPH_CONTAINER_DIR"
   contrib/compose-rhcs.sh
 popd > /dev/null
 
-COMPOSED_DIR=$CEPH_CONTAINER_DIR/staging/luminous-rhel7-7-released-x86_64/composed
+COMPOSED_DIR=$CEPH_CONTAINER_DIR/staging/luminous-rhel7-latest-x86_64/composed
 
 if [ ! -d "$COMPOSED_DIR" ]; then
   fatal "There is no composed directory. Looks like the build failed !"

contrib/compose-rhcs.sh

@@ -6,7 +6,7 @@ set -e
 # VARIABLES #
 #############
 
-STAGING_DIR=staging/luminous-rhel7-7-released-x86_64/
+STAGING_DIR=staging/luminous-rhel7-latest-x86_64/
 DAEMON_DIR=$STAGING_DIR/daemon
 DAEMON_BASE_DIR=${DAEMON_DIR}-base/
 DOCKERFILE_DAEMON=$DAEMON_DIR/Dockerfile
@@ -57,7 +57,7 @@ clean_staging() {
 }
 
 make_staging() {
-  make FLAVORS=luminous,rhel7,7-released || fatal "Cannot build rhel7"
+  make BASEOS_REGISTRY=registry.redhat.io BASEOS_REPO=rhel7/rhel FLAVORS=luminous,rhel7,latest || fatal "Cannot build rhel7"
 }
 
 success() {