From: Andrew Schoen <aschoen@redhat.com>
Date: Wed, 8 Apr 2015 14:45:45 +0000 (-0500)
Subject: Remove obsoleted repos for rhel 7
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5f541833f9d0d7ea7b1b17392f04e94b5b347541;p=ceph-cm-ansible.git

Remove obsoleted repos for rhel 7

These are now obsolete because we're registering with
subscription-manager and will use the repos provided there.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/roles/testnode/tasks/yum/repos.yml b/roles/testnode/tasks/yum/repos.yml
index 2bff84f..dd6f090 100644
--- a/roles/testnode/tasks/yum/repos.yml
+++ b/roles/testnode/tasks/yum/repos.yml
@@ -29,5 +29,5 @@
 - name: Clean yum cache
   shell: yum clean all
   changed_when: false
-  when: (repo_file and repo_file.changed) or
-        (gpg_keys and gpg_keys.changed)
+  when: (repo_file is defined and repo_file.changed) or
+        (gpg_keys is defined and gpg_keys.changed)
diff --git a/roles/testnode/vars/redhat_7.0.yml b/roles/testnode/vars/redhat_7.0.yml
deleted file mode 100644
index aa0c212..0000000
--- a/roles/testnode/vars/redhat_7.0.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-yum_repos:
-  rhel-7-repo:
-    name: My Red Hat Enterprise Linux $releasever - $basearch
-    baseurl: http://apt-mirror.front.sepia.ceph.com/rhel7repo/server
-    enabled: 1
-    gpgcheck: 0
-  rhel-7-optional:
-    name: My Red Hat Enterprise Linux $releasever - $basearch
-    baseurl: http://apt-mirror.front.sepia.ceph.com/rhel7repo/server-optional
-    enabled: 1
-    gpgcheck: 0
diff --git a/roles/testnode/vars/redhat_7.1.yml b/roles/testnode/vars/redhat_7.1.yml
deleted file mode 100644
index 702c205..0000000
--- a/roles/testnode/vars/redhat_7.1.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-yum_repos:
-  rhel-7.1-beta-repo:
-    name: My Red Hat Enterprise Linux $releasever - $basearch
-    baseurl: http://apt-mirror.front.sepia.ceph.com/rhel7.1-beta-repo/server/
-    enabled: 1
-    gpgcheck: 0
-  rhel-7.1-beta-optional:
-    name: My Red Hat Enterprise Linux $releasever - $basearch
-    baseurl: http://apt-mirror.front.sepia.ceph.com/rhel7.1-beta-repo/server-optional/
-    enabled: 1
-    gpgcheck: 0
diff --git a/roles/testnode/vars/redhat_7.yml b/roles/testnode/vars/redhat_7.yml
index 4d1ceff..fbc4efe 100644
--- a/roles/testnode/vars/redhat_7.yml
+++ b/roles/testnode/vars/redhat_7.yml
@@ -7,11 +7,6 @@ common_yum_repos:
     baseurl: http://apt-mirror.front.sepia.ceph.com/epel7/
     enabled: 1
     gpgcheck: 0
-  rhel-7-extras:
-    name: "My Red Hat Enterprise Linux $releasever - $basearch"
-    baseurl: http://apt-mirror.front.sepia.ceph.com/rhel7repo/extras
-    enabled: 1
-    gpgcheck: 0
   rhel-7-fcgi-ceph:
     name: "RHEL 7 Local fastcgi Repo"
     baseurl: http://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel7-x86_64-basic/ref/master/