Skip to content

Commit

Permalink
fixes #16945 - use node_fqdn for consumer cert RPM generation (#107)
Browse files Browse the repository at this point in the history
  • Loading branch information
stbenjam authored Oct 14, 2016
1 parent 02b1c3e commit 24dd091
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions manifests/katello.pp
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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
Expand Down

0 comments on commit 24dd091

Please sign in to comment.