diff options
author | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2017-03-13 14:56:01 +0200 |
---|---|---|
committer | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2017-03-26 14:10:26 +0000 |
commit | d9916ce77373f0f754486da73014e815f8ae7b54 (patch) | |
tree | 696fd8afff6e271f0f919631517660df21827ee1 /manifests/profile/base/rabbitmq.pp | |
parent | 2102a610c14d357f99a531250e676d6366559212 (diff) |
Remove certificate request bits from service profiles
This is now the job of the certmonger_user profile. So these bits are
not needed anymore in the service profiles.
Change-Id: Iaa3137d7d13d5e707f587d3905a5a32598c08800
Depends-On: Ibf58dfd7d783090e927de6629e487f968f7e05b6
Diffstat (limited to 'manifests/profile/base/rabbitmq.pp')
-rw-r--r-- | manifests/profile/base/rabbitmq.pp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/manifests/profile/base/rabbitmq.pp b/manifests/profile/base/rabbitmq.pp index b04d721..6def08b 100644 --- a/manifests/profile/base/rabbitmq.pp +++ b/manifests/profile/base/rabbitmq.pp @@ -42,12 +42,6 @@ # (Optional) RabbitMQ environment. # Defaults to hiera('rabbitmq_environment'). # -# [*generate_service_certificates*] -# (Optional) Whether or not certmonger will generate certificates for -# MySQL. This could be as many as specified by the $certificates_specs -# variable. -# Defaults to hiera('generate_service_certificate', false). -# # [*inet_dist_interface*] # (Optional) Address to bind the inter-cluster interface # to. It is the inet_dist_use_interface option in the kernel variables @@ -87,7 +81,6 @@ class tripleo::profile::base::rabbitmq ( $config_variables = hiera('rabbitmq_config_variables'), $enable_internal_tls = undef, # TODO(jaosorior): pass this via t-h-t $environment = hiera('rabbitmq_environment'), - $generate_service_certificates = hiera('generate_service_certificates', false), $inet_dist_interface = hiera('rabbitmq::interface', undef), $ipv6 = str2bool(hiera('rabbit_ipv6', false)), $kernel_variables = hiera('rabbitmq_kernel_variables'), @@ -98,9 +91,6 @@ class tripleo::profile::base::rabbitmq ( $step = hiera('step'), ) { if $enable_internal_tls { - if $generate_service_certificates { - ensure_resource('class', 'tripleo::certmonger::rabbitmq', $certificate_specs) - } $tls_certfile = $certificate_specs['service_certificate'] $tls_keyfile = $certificate_specs['service_key'] } else { |