Bug 1766122

Description of problem:

From checking the import broke Qdr InternalTLS support broken with puppet-tripleo-8.5.1-1.el7ost from BZ1700918.
Commit 73bae35607c7031b318dc5ce789203a7b4d99421 is missing after latest import.

Realized with https://bugzilla.redhat.com/show_bug.cgi?id=1761373#c8 that manifests/profile/base/certmonger_user.pp
has issues and the above mentioned qdr tls-everywhere patch is missing/broken:

$ git show 899837a3afc118b09d5cec45afe1dc8f585d986e
commit 899837a3afc118b09d5cec45afe1dc8f585d986e
Author: Juan Antonio Osorio Robles <jaosorior>
Date:   Wed Jan 30 15:39:23 2019 +0200

    Only request certs in step 1
    
    The certmonger-user service used to run in every step. This limits it to
    only step 1.
    
    Upstream-Stein: https://review.opendev.org/#/c/633944/
    Upstream-Rocky: https://review.opendev.org/#/c/663288/
    Upstream-Queens: https://review.opendev.org/#/c/663874/
    
    Resolves: rhbz#1718629
    Change-Id: I119fa1da61f2385c672391beb4071f0ac2731f21
    (cherry picked from commit 98e9879fd55194ed86c294158cabbf21ec1c903f)
    (cherry picked from commit 78f21fcf3ba3c5c2586d68c521440022dcd57305)
    Signed-off-by: Moises Guimaraes de Medeiros <moguimar>

diff --git a/manifests/profile/base/certmonger_user.pp b/manifests/profile/base/certmonger_user.pp
index 6dbdcb48..c929793c 100644
--- a/manifests/profile/base/certmonger_user.pp
+++ b/manifests/profile/base/certmonger_user.pp
@@ -196,6 +196,9 @@ class tripleo::profile::base::certmonger_user (
     unless empty($mongodb_certificate_specs) {
       ensure_resource('class', 'tripleo::certmonger::mongodb', $mongodb_certificate_specs)
     }
+    unless empty($qdr_certificate_specs) {
+      ensure_resource('class', 'tripleo::certmonger::metrics_qdr', $qdr_certificate_specs)
+    }
     unless empty($mysql_certificate_specs) {
       ensure_resource('class', 'tripleo::certmonger::mysql', $mysql_certificate_specs)
     }


Checking the difference between puppet-tripleo-8.4.1-24.el7ost and rhos-13.0-patches branch:

$ diff -u manifests/profile/base/certmonger_user.pp /tmp/puppet-tripleo/usr/share/openstack-puppet/modules/tripleo/manifests/profile/base/certmonger_user.pp
--- manifests/profile/base/certmonger_user.pp   2019-10-28 10:04:21.958899491 +0100
+++ /home/mschuppe/Downloads/puppet-tripleo/usr/share/openstack-puppet/modules/tripleo/manifests/profile/base/certmonger_user.pp        2019-10-28 10:11:13.136411168 +0100
@@ -73,6 +73,11 @@
 #   it will create.
 #   Defaults to hiera('mongodb_certificate_specs',{})
 #
+# [*qdr_certificate_specs*]
+#   (Optional) The specifications to give to certmonger fot the certificate(s)
+#   it will create.
+#   Defaults to hiera('tripleo::profile::base::metrics::qdr::certificate_specs', {}).
+#
 # [*mysql_certificate_specs*]
 #   (Optional) The specifications to give to certmonger for the certificate(s)
 #   it will create.
@@ -139,6 +144,7 @@
   $libvirt_vnc_certificates_specs = hiera('libvirt_vnc_certificates_specs', {}),
   $libvirt_vnc_postsave_cmd       = undef,
   $mongodb_certificate_specs  = hiera('mongodb_certificate_specs',{}),
+  $qdr_certificate_specs      = hiera('tripleo::profile::base::metrics::qdr::certificate_specs', {}),
   $mysql_certificate_specs    = hiera('tripleo::profile::base::database::mysql::certificate_specs', {}),
   $rabbitmq_certificate_specs = hiera('tripleo::profile::base::rabbitmq::certificate_specs', {}),
   $redis_certificate_specs    = hiera('redis_certificate_specs', {}),


Version-Release number of selected component (if applicable):
puppet-tripleo-8.5.1-1.el7ost

How reproducible:


Steps to Reproduce:
1.
2.
3.

Actual results:


Expected results:


Additional info: