puddle: update URL variable conventions

1) Remove "_z" from the RHEL repository variables. There's no point in
distinguishing "RHEL 7 z" from "RHEL 7".

2) Add "_server" to distinguish the RHEL Server variant from the
Workstation/Client/ComputeNode variants.

diff --git a/roles/puddle/defaults/main.yml b/roles/puddle/defaults/main.yml
index 5deca79d7e541dccc4efcf61e50cd2f34d38ad7e..4632f4d1ed599f4a646b44afc00c4ba9512c4e1e 100644 (file)
--- a/roles/puddle/defaults/main.yml
+++ b/roles/puddle/defaults/main.yml
@@ -8,14 +8,14 @@ puddle:
   mnt_redhat_nfs_src: ''
   brewroot_url: ''
   topurl: ''
-  rhel_7_z_repo_url: ''
-  rhel_7_common_repo_url: ''
+  rhel_7_server_repo_url: ''
+  rhel_7_common_server_repo_url: ''
   rhel_7_ceph_calamari_1_2_repo_url: ''
   rhel_7_ceph_installer_1_2_repo_url: ''
   rhel_7_ceph_mon_1_2_repo_url: ''
   rhel_7_ceph_osd_1_2_repo_url: ''
-  rhel_6_z_repo_url: ''
-  rhel_6_common_repo_url: ''
+  rhel_6_server_repo_url: ''
+  rhel_6_common_server_repo_url: ''
   rhel_6_ceph_calamari_1_2_repo_url: ''
   rhel_6_ceph_installer_1_2_repo_url: '/'
   rhel_6_ceph_mon_1_2_repo_url: ''

diff --git a/roles/puddle/templates/ceph-1.2-rhel-6-async.conf b/roles/puddle/templates/ceph-1.2-rhel-6-async.conf
index ec529ec4b79c6d8025d37660fcbe66694339ddab..a7d06032f095766c52d0cb26adec8329ba0c166f 100644 (file)
--- a/roles/puddle/templates/ceph-1.2-rhel-6-async.conf
+++ b/roles/puddle/templates/ceph-1.2-rhel-6-async.conf
@@ -22,16 +22,16 @@ cdndir = no
 
 [RH6-CEPH-CALAMARI-1.2]
 variant = RH6-CEPH-CALAMARI-1.2
-external = {{ puddle.rhel_6_z_repo_url }},{{ puddle.rhel_6_ceph_calamari_1_2_repo_url }}
+external = {{ puddle.rhel_6_server_repo_url }},{{ puddle.rhel_6_ceph_calamari_1_2_repo_url }}
 
 [RH6-CEPH-INSTALLER-1.2]
 variant = RH6-CEPH-INSTALLER-1.2
-external = {{ puddle.rhel_6_z_repo_url }},{{ puddle.rhel_6_ceph_installer_1_2_repo_url }}
+external = {{ puddle.rhel_6_server_repo_url }},{{ puddle.rhel_6_ceph_installer_1_2_repo_url }}
 
 [RH6-CEPH-MON-1.2]
 variant = RH6-CEPH-MON-1.2
-external = {{ puddle.rhel_6_z_repo_url }},{{ puddle.rhel_6_ceph_mon_1_2_repo_url }}
+external = {{ puddle.rhel_6_server_repo_url }},{{ puddle.rhel_6_ceph_mon_1_2_repo_url }}
 
 [RH6-CEPH-OSD-1.2]
 variant = RH6-CEPH-OSD-1.2
-external = {{ puddle.rhel_6_z_repo_url }},{{ puddle.rhel_6_ceph_osd_1_2_repo_url }}
+external = {{ puddle.rhel_6_server_repo_url }},{{ puddle.rhel_6_ceph_osd_1_2_repo_url }}

diff --git a/roles/puddle/templates/ceph-1.2-rhel-6.conf b/roles/puddle/templates/ceph-1.2-rhel-6.conf
index 7369c46ddab90f3747599aebbbd58df41a17149b..89864b00155a04123f80a3d0defb40ef60facd8c 100644 (file)
--- a/roles/puddle/templates/ceph-1.2-rhel-6.conf
+++ b/roles/puddle/templates/ceph-1.2-rhel-6.conf
@@ -22,20 +22,20 @@ cdndir = no
 
 [RH6-CEPH-CALAMARI-1.2]
 variant = RH6-CEPH-CALAMARI-1.2
-external = {{ puddle.rhel_6_z_repo_url }}
+external = {{ puddle.rhel_6_server_repo_url }}
 keys = fd431d51,f21541eb
 
 [RH6-CEPH-INSTALLER-1.2]
 variant = RH6-CEPH-INSTALLER-1.2
-external = {{ puddle.rhel_6_z_repo_url }}
+external = {{ puddle.rhel_6_server_repo_url }}
 keys = fd431d51,f21541eb
 
 [RH6-CEPH-MON-1.2]
 variant = RH6-CEPH-MON-1.2
-external = {{ puddle.rhel_6_z_repo_url }}
+external = {{ puddle.rhel_6_server_repo_url }}
 keys = fd431d51,f21541eb
 
 [RH6-CEPH-OSD-1.2]
 variant = RH6-CEPH-OSD-1.2
-external = {{ puddle.rhel_6_z_repo_url }}
+external = {{ puddle.rhel_6_server_repo_url }}
 keys = fd431d51,f21541eb

diff --git a/roles/puddle/templates/ceph-1.2-rhel-7-async.conf b/roles/puddle/templates/ceph-1.2-rhel-7-async.conf
index f2ff24a9730b1cbd1faf6458c90309de7fb3f577..2a8b6bfebd6e8c90ebba63edff1b3fb37103d346 100644 (file)
--- a/roles/puddle/templates/ceph-1.2-rhel-7-async.conf
+++ b/roles/puddle/templates/ceph-1.2-rhel-7-async.conf
@@ -22,16 +22,16 @@ cdndir = no
 
 [Server-RH7-CEPH-CALAMARI-1.2]
 variant = Server-RH7-CEPH-CALAMARI-1.2
-external = {{ puddle.rhel_7_z_repo_url }},{{ puddle.rhel_7_ceph_calamari_1_2_repo_url }}
+external = {{ puddle.rhel_7_server_repo_url }},{{ puddle.rhel_7_ceph_calamari_1_2_repo_url }}
 
 [Server-RH7-CEPH-INSTALLER-1.2]
 variant = Server-RH7-CEPH-INSTALLER-1.2
-external = {{ puddle.rhel_7_z_repo_url }},{{ puddle.rhel_7_ceph_installer_1_2_repo_url }}
+external = {{ puddle.rhel_7_server_repo_url }},{{ puddle.rhel_7_ceph_installer_1_2_repo_url }}
 
 [Server-RH7-CEPH-MON-1.2]
 variant = Server-RH7-CEPH-MON-1.2
-external = {{ puddle.rhel_7_z_repo_url }},{{ puddle.rhel_7_ceph_mon_1_2_repo_url }}
+external = {{ puddle.rhel_7_server_repo_url }},{{ puddle.rhel_7_ceph_mon_1_2_repo_url }}
 
 [Server-RH7-CEPH-OSD-1.2]
 variant = Server-RH7-CEPH-OSD-1.2
-external = {{ puddle.rhel_7_z_repo_url }},{{ puddle.rhel_7_ceph_osd_1_2_repo_url }}
+external = {{ puddle.rhel_7_server_repo_url }},{{ puddle.rhel_7_ceph_osd_1_2_repo_url }}

diff --git a/roles/puddle/templates/ceph-1.2-rhel-7.conf b/roles/puddle/templates/ceph-1.2-rhel-7.conf
index 20893948f3985a1236ddc8087c1239f21a342337..572447091ce3f1126a73303dc2213ac2750bfa85 100644 (file)
--- a/roles/puddle/templates/ceph-1.2-rhel-7.conf
+++ b/roles/puddle/templates/ceph-1.2-rhel-7.conf
@@ -22,20 +22,20 @@ cdndir = no
 
 [Server-RH7-CEPH-CALAMARI-1.2]
 variant = Server-RH7-CEPH-CALAMARI-1.2
-external = {{ puddle.rhel_7_z_repo_url }}
+external = {{ puddle.rhel_7_server_repo_url }}
 keys = fd431d51,f21541eb
 
 [Server-RH7-CEPH-INSTALLER-1.2]
 variant = Server-RH7-CEPH-INSTALLER-1.2
-external = {{ puddle.rhel_7_z_repo_url }}
+external = {{ puddle.rhel_7_server_repo_url }}
 keys = fd431d51,f21541eb
 
 [Server-RH7-CEPH-MON-1.2]
 variant = Server-RH7-CEPH-MON-1.2
-external = {{ puddle.rhel_7_z_repo_url }}
+external = {{ puddle.rhel_7_server_repo_url }}
 keys = fd431d51,f21541eb
 
 [Server-RH7-CEPH-OSD-1.2]
 variant = Server-RH7-CEPH-OSD-1.2
-external = {{ puddle.rhel_7_z_repo_url }}
+external = {{ puddle.rhel_7_server_repo_url }}
 keys = fd431d51,f21541eb

diff --git a/roles/puddle/templates/ceph-1.3-rhel-7.conf b/roles/puddle/templates/ceph-1.3-rhel-7.conf
index fe79cbfdaba16e8f3348415a64e865becd6a62c8..a65d6f38f5d0fe826a9c7a1c57e211c762e06c70 100644 (file)
--- a/roles/puddle/templates/ceph-1.3-rhel-7.conf
+++ b/roles/puddle/templates/ceph-1.3-rhel-7.conf
@@ -23,25 +23,25 @@ cdndir = no
 
 [Server-RH7-CEPH-CALAMARI-1.3]
 variant = Server-RH7-CEPH-CALAMARI-1.3
-external = {{ puddle.rhel_7_z_repo_url }}
+external = {{ puddle.rhel_7_server_repo_url }}
 keys = fd431d51,f21541eb
 
 [Server-RH7-CEPH-INSTALLER-1.3]
 variant = Server-RH7-CEPH-INSTALLER-1.3
-external = {{ puddle.rhel_7_z_repo_url }}
+external = {{ puddle.rhel_7_server_repo_url }}
 keys = fd431d51,f21541eb
 
 [Server-RH7-CEPH-MON-1.3]
 variant = Server-RH7-CEPH-MON-1.3
-external = {{ puddle.rhel_7_z_repo_url }}
+external = {{ puddle.rhel_7_server_repo_url }}
 keys = fd431d51,f21541eb
 
 [Server-RH7-CEPH-OSD-1.3]
 variant = Server-RH7-CEPH-OSD-1.3
-external = {{ puddle.rhel_7_z_repo_url }}
+external = {{ puddle.rhel_7_server_repo_url }}
 keys = fd431d51,f21541eb
 
 [Server-RH7-CEPH-TOOLS-1.3]
 variant = Server-RH7-CEPH-TOOLS-1.3
-external = {{ puddle.rhel_7_z_repo_url }}
+external = {{ puddle.rhel_7_server_repo_url }}
 keys = fd431d51,f21541eb

diff --git a/roles/puddle/templates/rh-common-rhel-6.conf b/roles/puddle/templates/rh-common-rhel-6.conf
index e2543366b94f3ac4700024fac157495ba1bca5c4..d8d29839f3b576816ceb41b8758e0bdd229b91d4 100644 (file)
--- a/roles/puddle/templates/rh-common-rhel-6.conf
+++ b/roles/puddle/templates/rh-common-rhel-6.conf
@@ -23,4 +23,4 @@ cdndir = no
 
 [rh-common-rhel-6.5]
 variant = RH-Common
-external = {{ puddle.rhel_6_z_repo_url }},{{ puddle.rhel_6_common_repo_url }}
+external = {{ puddle.rhel_6_server_repo_url }},{{ puddle.rhel_6_common_server_repo_url }}

diff --git a/roles/puddle/templates/rh-common-rhel-7.conf b/roles/puddle/templates/rh-common-rhel-7.conf
index 2f44842fba32fbe66def56ae53e2376adf406793..5361b535c6abbe4cd213d3422de6396d7a165f28 100644 (file)
--- a/roles/puddle/templates/rh-common-rhel-7.conf
+++ b/roles/puddle/templates/rh-common-rhel-7.conf
@@ -23,4 +23,4 @@ cdndir = no
 
 [rh-common-rhel-7.1]
 variant = Server-RH-Common
-external = {{ puddle.rhel_7_z_repo_url }},{{ puddle.rhel_7_common_repo_url }}
+external = {{ puddle.rhel_7_server_repo_url }},{{ puddle.rhel_7_common_server_repo_url }}