From 615cf22997903f424629b0a793ed866e5aba5b0d Mon Sep 17 00:00:00 2001
From: Stephen Benjamin <stephen@redhat.com>
Date: Fri, 14 Oct 2016 10:15:35 -0400
Subject: [PATCH] fixes #16945 - use node_fqdn for consumer cert RPM generation

---
 manifests/katello.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/katello.pp b/manifests/katello.pp
index 458898b5..1998c350 100644
--- a/manifests/katello.pp
+++ b/manifests/katello.pp
@@ -1,6 +1,6 @@
 # Katello specific certs settings
 class certs::katello (
-  $hostname                      = $fqdn,
+  $hostname                      = $::certs::node_fqdn,
   $deployment_url                = undef,
   $rhsm_port                     = 443,
   $candlepin_cert_rpm_alias_filename = undef,
@@ -16,8 +16,8 @@
   $katello_rhsm_setup_script      = 'katello-rhsm-consumer'
   $katello_rhsm_setup_script_location = "/usr/bin/${katello_rhsm_setup_script}"
 
-  $candlepin_consumer_name        = "katello-ca-consumer-${::fqdn}"
-  $candlepin_consumer_summary     = "Subscription-manager consumer certificate for Katello instance ${::fqdn}"
+  $candlepin_consumer_name        = "katello-ca-consumer-${hostname}"
+  $candlepin_consumer_summary     = "Subscription-manager consumer certificate for Katello instance ${hostname}"
   $candlepin_consumer_description = 'Consumer certificate and post installation script that configures rhsm.'
 
   include ::trusted_ca