From fa0c468a183261ce7e948143fdbad121d37c1616 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Wed, 29 Jul 2015 12:09:31 -0600 Subject: [PATCH] puddle: add ceph-1.3.0 to async configs Similar to the change in commit 84818a7a7bd00a3c18f0326c312dc3abef77c05e, add the the CEPH-1.3 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. --- .../templates/ceph-1.3-rhel-7-async.conf | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/roles/puddle/templates/ceph-1.3-rhel-7-async.conf b/roles/puddle/templates/ceph-1.3-rhel-7-async.conf index aaf74e5..4302e80 100644 --- a/roles/puddle/templates/ceph-1.3-rhel-7-async.conf +++ b/roles/puddle/templates/ceph-1.3-rhel-7-async.conf @@ -4,9 +4,7 @@ [puddle] type = errata -errata_release = no -errata_whitelist = 20942,21015 -errata_blacklist = no +errata_release = CEPH-1.3.0,CEPH-ASYNC product_name = RHCeph version = 1.3-RHEL-7 rootdir = /var/www/{{ ansible_hostname }}/htdocs/puddles @@ -23,35 +21,35 @@ cdndir = no [Server-RH7-CEPH-CALAMARI-1.3] variant = Server-RH7-CEPH-CALAMARI-1.3 -external = {{ puddle.rhel_7_server_repo_url }},{{ puddle.rhel_7_ceph_calamari_1_3_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_server_repo_url }},{{ puddle.rhel_7_ceph_mon_1_3_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_server_repo_url }},{{ puddle.rhel_7_ceph_osd_1_3_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_server_repo_url }},{{ puddle.rhel_7_ceph_tools_1_3_server_repo_url }} +external = {{ puddle.rhel_7_server_repo_url }} keys = fd431d51,f21541eb [Client-RH7-CEPH-TOOLS-1.3] variant = Client-RH7-CEPH-TOOLS-1.3 -external = {{ puddle.rhel_7_client_repo_url }},{{ puddle.rhel_7_ceph_tools_1_3_client_repo_url }} +external = {{ puddle.rhel_7_client_repo_url }} keys = fd431d51,f21541eb [ComputeNode-RH7-CEPH-TOOLS-1.3] variant = ComputeNode-RH7-CEPH-TOOLS-1.3 -external = {{ puddle.rhel_7_computenode_repo_url }},{{ puddle.rhel_7_ceph_tools_1_3_computenode_repo_url }} +external = {{ puddle.rhel_7_computenode_repo_url }} keys = fd431d51,f21541eb [Workstation-RH7-CEPH-TOOLS-1.3] variant = Workstation-RH7-CEPH-TOOLS-1.3 -external = {{ puddle.rhel_7_workstation_repo_url }},{{ puddle.rhel_7_ceph_tools_1_3_workstation_repo_url }} +external = {{ puddle.rhel_7_workstation_repo_url }} keys = fd431d51,f21541eb -- 2.39.5