Use the var mirror_host instead of a hardcoded value in rpm repos.

The var will be added to the appropriate secrets repo.

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

diff --git a/roles/testnode/defaults/main.yml b/roles/testnode/defaults/main.yml
index 6eb90731b24c45a2b2ef3beae7dc36cc151c75a2..fd27a81718ab5ff9a8483a9f9150307e114de942 100644 (file)
--- a/roles/testnode/defaults/main.yml
+++ b/roles/testnode/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-pip_mirror_url: "http://apt-mirror.front.sepia.ceph.com/pypi/simple"
+pip_mirror_url: "http://{{ mirror_host }}/pypi/simple"
 
 subscription_manager_activationkey: ""
 subscription_manager_org: ""

diff --git a/roles/testnode/vars/centos_6.yml b/roles/testnode/vars/centos_6.yml
index 526d1970ab7c01bd1f1c69c06fe2a5a028ec2ba0..12249ba172cd5e8a00d83de5dd6fc228460d0cc2 100644 (file)
--- a/roles/testnode/vars/centos_6.yml
+++ b/roles/testnode/vars/centos_6.yml
@@ -4,7 +4,7 @@
 yum_repos:
   epel:
     name: Extra Packages for Enterprise Linux 6 - $basearch 
-    baseurl: http://apt-mirror.front.sepia.ceph.com/epel6/
+    baseurl: "http://{{ mirror_host }}/epel6/"
     enabled: 1
     gpgcheck: 0
   centos6-qemu-ceph:
@@ -21,7 +21,7 @@ yum_repos:
     priority: 2
   centos6-misc-ceph:
     name: Cent OS 6 Local misc Repo
-    baseurl: http://apt-mirror.front.sepia.ceph.com/misc-rpms/
+    baseurl: "http://{{ mirror_host }}/misc-rpms/"
     enabled: 1
     gpgcheck: 0
     priority: 2
@@ -33,13 +33,13 @@ yum_repos:
     priority: 2
   rpmforge:
     name: Red Hat Enterprise $releasever - RPMforge.net - dag
-    baseurl: http://apt-mirror.front.sepia.ceph.com/rpmforge/
+    baseurl: "http://{{ mirror_host }}/rpmforge/"
     enabled: 1
     gpgcheck: 0
     protect: 0
   lab-extras:
     name: lab-extras
-    baseurl: http://apt-mirror.front.sepia.ceph.com/lab-extras/centos6/
+    baseurl: "http://{{ mirror_host }}/lab-extras/centos6/"
     enabled: 1
     gpgcheck: 0
     priority: 2

diff --git a/roles/testnode/vars/centos_7.yml b/roles/testnode/vars/centos_7.yml
index f0be08022ed55e4243a24343172bee4c0385ddbb..8e345ed35981606df768b42f40df43e3c4e4a2e5 100644 (file)
--- a/roles/testnode/vars/centos_7.yml
+++ b/roles/testnode/vars/centos_7.yml
@@ -4,7 +4,7 @@
 yum_repos:
   epel:
     name: "Extra Packages for Enterprise Linux 7 - $basearch"
-    baseurl: http://apt-mirror.front.sepia.ceph.com/epel7/
+    baseurl: "http://{{ mirror_host }}/epel7/"
     enabled: 1
     gpgcheck: 0
   centos7-fcgi-ceph:
@@ -15,7 +15,7 @@ yum_repos:
     priority: 2
   lab-extras:
     name: lab-extras
-    baseurl: http://apt-mirror.front.sepia.ceph.com/lab-extras/centos7/
+    baseurl: "http://{{ mirror_host }}/lab-extras/centos7/"
     enabled: 1
     gpgcheck: 0
     priority: 2

diff --git a/roles/testnode/vars/redhat_6.yml b/roles/testnode/vars/redhat_6.yml
index 9d444b69370352c069d93d84d00d787d6884db39..a1e9a8da322a693dec3ed8d9a86ad27a659bd4c9 100644 (file)
--- a/roles/testnode/vars/redhat_6.yml
+++ b/roles/testnode/vars/redhat_6.yml
@@ -4,7 +4,7 @@
 common_yum_repos:
   epel:
     name: "Extra Packages for Enterprise Linux 6 - $basearch"
-    baseurl: http://apt-mirror.front.sepia.ceph.com/epel6/
+    baseurl: "http://{{ mirror_host }}/epel6/"
     enabled: 1
     gpgcheck: 0
   centos6-qemu-ceph:
@@ -15,7 +15,7 @@ common_yum_repos:
     priority: 2
   lab-extras:
     name: "lab-extras"
-    baseurl: http://apt-mirror.front.sepia.ceph.com/lab-extras/rhel6/
+    baseurl: "http://{{ mirror_host }}/lab-extras/rhel6/"
     enabled: 1
     gpgcheck: 0
     priority: 2
@@ -27,7 +27,7 @@ common_yum_repos:
     priority: 2
   centos6-misc-ceph:
     name: "Cent OS 6 Local misc Repo"
-    baseurl: http://apt-mirror.front.sepia.ceph.com/misc-rpms/
+    baseurl: "http://{{ mirror_host }}/misc-rpms/"
     enabled: 1
     gpgcheck: 0
     priority: 2

diff --git a/roles/testnode/vars/redhat_7.yml b/roles/testnode/vars/redhat_7.yml
index fbc4efe4522d1e332b8cba0648713ee5b9246644..a96bd789bdb81486329c9de1ef95f8957bc8fc55 100644 (file)
--- a/roles/testnode/vars/redhat_7.yml
+++ b/roles/testnode/vars/redhat_7.yml
@@ -4,7 +4,7 @@
 common_yum_repos:
   epel:
     name: "Extra Packages for Enterprise Linux 7 - $basearch"
-    baseurl: http://apt-mirror.front.sepia.ceph.com/epel7/
+    baseurl: "http://{{ mirror_host }}/epel7/"
     enabled: 1
     gpgcheck: 0
   rhel-7-fcgi-ceph:
@@ -15,7 +15,7 @@ common_yum_repos:
     priority: 2
   lab-extras:
     name: "lab-extras"
-    baseurl: http://apt-mirror.front.sepia.ceph.com/lab-extras/rhel7/
+    baseurl: "http://{{ mirror_host }}/lab-extras/rhel7/"
     enabled: 1
     gpgcheck: 0
     priority: 2