puddle: add ceph-1.2 to async configs

Add the the CEPH-1.2 release to the CEPH-ASYNC config files.

The purpose of this change is to make it easier for QE to consume
the builds in Puddle repos that correspond to ASYNC advisories.

Prior to this change, QE had to make sure to enable the production Ceph
repositories with subscription-manager before using the packages in an
ASYNC advisory's Puddle. With this change, all the latest "1.2.3"
packages will be combined together with the "1.2-async" packages into a
single Puddle.

This has a side-effect advantage in that we can simplify the "externals"
sections of these config files.

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 a7d06032f095766c52d0cb26adec8329ba0c166f..063b217a45f926daabad12a5f17c05a9c53e5f2e 100644 (file)
--- a/roles/puddle/templates/ceph-1.2-rhel-6-async.conf
+++ b/roles/puddle/templates/ceph-1.2-rhel-6-async.conf
@@ -4,7 +4,7 @@
 
 [puddle]
 type = errata
-errata_release = CEPH-ASYNC
+errata_release = CEPH-1.2,CEPH-ASYNC
 errata_whitelist = no
 product_name = RHCeph
 version = 1.2-RHEL-6
@@ -22,16 +22,16 @@ cdndir = no
 
 [RH6-CEPH-CALAMARI-1.2]
 variant = RH6-CEPH-CALAMARI-1.2
-external = {{ puddle.rhel_6_server_repo_url }},{{ puddle.rhel_6_ceph_calamari_1_2_repo_url }}
+external = {{ puddle.rhel_6_server_repo_url }}
 
 [RH6-CEPH-INSTALLER-1.2]
 variant = RH6-CEPH-INSTALLER-1.2
-external = {{ puddle.rhel_6_server_repo_url }},{{ puddle.rhel_6_ceph_installer_1_2_repo_url }}
+external = {{ puddle.rhel_6_server_repo_url }}
 
 [RH6-CEPH-MON-1.2]
 variant = RH6-CEPH-MON-1.2
-external = {{ puddle.rhel_6_server_repo_url }},{{ puddle.rhel_6_ceph_mon_1_2_repo_url }}
+external = {{ puddle.rhel_6_server_repo_url }}
 
 [RH6-CEPH-OSD-1.2]
 variant = RH6-CEPH-OSD-1.2
-external = {{ puddle.rhel_6_server_repo_url }},{{ puddle.rhel_6_ceph_osd_1_2_repo_url }}
+external = {{ puddle.rhel_6_server_repo_url }}

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 2a8b6bfebd6e8c90ebba63edff1b3fb37103d346..0b36def92b70ce54e9334f2d08bde6737ae29e92 100644 (file)
--- a/roles/puddle/templates/ceph-1.2-rhel-7-async.conf
+++ b/roles/puddle/templates/ceph-1.2-rhel-7-async.conf
@@ -4,8 +4,7 @@
 
 [puddle]
 type = errata
-errata_release = CEPH-ASYNC
-errata_whitelist = no
+errata_release = CEPH-1.2,CEPH-ASYNC
 product_name = RHCeph
 version = 1.2-RHEL-7
 rootdir = /var/www/{{ ansible_hostname }}/htdocs/puddles
@@ -22,16 +21,20 @@ cdndir = no
 
 [Server-RH7-CEPH-CALAMARI-1.2]
 variant = Server-RH7-CEPH-CALAMARI-1.2
-external = {{ puddle.rhel_7_server_repo_url }},{{ puddle.rhel_7_ceph_calamari_1_2_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_server_repo_url }},{{ puddle.rhel_7_ceph_installer_1_2_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_server_repo_url }},{{ puddle.rhel_7_ceph_mon_1_2_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_server_repo_url }},{{ puddle.rhel_7_ceph_osd_1_2_repo_url }}
+external = {{ puddle.rhel_7_server_repo_url }}
+keys = fd431d51,f21541eb