common: RHEL8 GAed so use CDN/RHSM repos

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/roles/common/vars/redhat_8.yml b/roles/common/vars/redhat_8.yml
index 1ba19661461654352737c6cbeff74f505cb90624..db6f0b78393af221a1a936f92a4fe98d0540532f 100644 (file)
--- a/roles/common/vars/redhat_8.yml
+++ b/roles/common/vars/redhat_8.yml
@@ -1,29 +1,4 @@
 ---
-# RHEL8 repos are not yet available via RHSM
-rhsm_repos: []
-
-# Don't use satellite until RHEL8 is GAed
-use_satellite: false
-
-# These are temporary until RHEL8 is GAed
-beta_repos:
-  rhel-beta-baseos:
-    name: "RHEL {{ ansible_distribution_version }} BaseOS (RPMs)"
-    baseurl: "http://drop.front.sepia.ceph.com/el8/baseos/"
-    enabled: 1
-    gpgcheck: 0
-  rhel-beta-appstream:
-    name: "RHEL {{ ansible_distribution_version }} AppStream (RPMs)"
-    baseurl: "http://drop.front.sepia.ceph.com/el8/appstream/"
-    enabled: 1
-    gpgcheck: 0
-  rhel8-ceph:
-    name: "RHCS 4.0 Scratch Build RPMs"
-    baseurl: "http://drop.front.sepia.ceph.com/el8/latest/"
-    enabled: 1
-    gpgcheck: 0
-  rhel8-ceph-deps:
-    name: "RHCS 4.0 Scratch Build Dependency RPMs"
-    baseurl: "http://drop.front.sepia.ceph.com/el8/deps/"
-    enabled: 1
-    gpgcheck: 0
+rhsm_repos:
+  - rhel-8-for-x86_64-baseos-rpms
+  - rhel-8-for-x86_64-appstream-rpms