From 7414edfee73b827c4b7c343ea1ee388d78848c04 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Mon, 9 Apr 2018 07:39:38 +0300
Subject: [PATCH] Default CertmongerUser to be defined for undercloud setup

In instack-undercloud we're defaulting the certmonger_user puppet setup
to be always included [1]. This is because we want it to setup the local
CA, even if it doesn't set up any certificates. We want the same for the
containerized undercloud.

[1] https://review.openstack.org/#/c/558768

Change-Id: I4ec27755de82b9ced9144c27089eba33b36cb17f
---
 environments/public-tls-undercloud.yaml    | 1 -
 overcloud-resource-registry-puppet.j2.yaml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/environments/public-tls-undercloud.yaml b/environments/public-tls-undercloud.yaml
index 9542c53f1f..cb8c174734 100644
--- a/environments/public-tls-undercloud.yaml
+++ b/environments/public-tls-undercloud.yaml
@@ -3,5 +3,4 @@ parameter_defaults:
   PublicSSLCertificateAutogenerated: true
 
 resource_registry:
-  OS::TripleO::Services::CertmongerUser: ../puppet/services/certmonger-user.yaml
   OS::TripleO::Services::HAProxyPublicTLS: ../puppet/services/haproxy-public-tls-certmonger.yaml
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 7d658033c4..54dfc41dd0 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -312,7 +312,7 @@ resource_registry:
   OS::TripleO::Services::NeutronVppAgent: OS::Heat::None
   OS::TripleO::Services::Docker: puppet/services/docker.yaml
   OS::TripleO::Services::DockerRegistry: OS::Heat::None
-  OS::TripleO::Services::CertmongerUser: OS::Heat::None
+  OS::TripleO::Services::CertmongerUser: puppet/services/certmonger-user.yaml
   OS::TripleO::Services::Clustercheck: OS::Heat::None
   OS::TripleO::Services::RsyslogSidecar: OS::Heat::None
   OS::TripleO::Services::VRTSHyperScale: OS::Heat::None