openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "TLS everywhere: Set post-save command for RabbitMQ"

Browse Source
This commit is contained in:
Zuul 2019-01-31 11:35:07 +00:00 committed by Gerrit Code Review
commit a10588f3a4
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/services/messaging/notify-rabbitmq.yaml
View File

@ -112,6 +112,7 @@ outputs:
if: if:
- internal_tls_enabled - internal_tls_enabled
- generate_service_certificates: true - generate_service_certificates: true
tripleo::rabbitmq::service_certificate: '/etc/pki/tls/certs/rabbitmq.crt'
tripleo::profile::base::rabbitmq::certificate_specs: tripleo::profile::base::rabbitmq::certificate_specs:
service_certificate: '/etc/pki/tls/certs/rabbitmq.crt' service_certificate: '/etc/pki/tls/certs/rabbitmq.crt'
service_key: '/etc/pki/tls/private/rabbitmq.key' service_key: '/etc/pki/tls/private/rabbitmq.key'
@ -125,6 +126,7 @@ outputs:
template: "rabbitmq/%{hiera('fqdn_NETWORK')}" template: "rabbitmq/%{hiera('fqdn_NETWORK')}"
params: params:
NETWORK: {get_param: [ServiceNetMap, OsloMessagingNotifyNetwork]} NETWORK: {get_param: [ServiceNetMap, OsloMessagingNotifyNetwork]}
postsave_cmd: "/usr/bin/certmonger-rabbitmq-refresh.sh"
- {} - {}
step_config: | step_config: |
include ::tripleo::profile::base::rabbitmq include ::tripleo::profile::base::rabbitmq

2
puppet/services/messaging/rpc-rabbitmq.yaml
View File

@ -113,6 +113,7 @@ outputs:
if: if:
- internal_tls_enabled - internal_tls_enabled
- generate_service_certificates: true - generate_service_certificates: true
tripleo::rabbitmq::service_certificate: '/etc/pki/tls/certs/rabbitmq.crt'
tripleo::profile::base::rabbitmq::certificate_specs: tripleo::profile::base::rabbitmq::certificate_specs:
service_certificate: '/etc/pki/tls/certs/rabbitmq.crt' service_certificate: '/etc/pki/tls/certs/rabbitmq.crt'
service_key: '/etc/pki/tls/private/rabbitmq.key' service_key: '/etc/pki/tls/private/rabbitmq.key'
@ -126,6 +127,7 @@ outputs:
template: "rabbitmq/%{hiera('fqdn_NETWORK')}" template: "rabbitmq/%{hiera('fqdn_NETWORK')}"
params: params:
NETWORK: {get_param: [ServiceNetMap, OsloMessagingRpcNetwork]} NETWORK: {get_param: [ServiceNetMap, OsloMessagingRpcNetwork]}
postsave_cmd: "/usr/bin/certmonger-rabbitmq-refresh.sh"
- {} - {}
step_config: | step_config: |
include ::tripleo::profile::base::rabbitmq include ::tripleo::profile::base::rabbitmq

2
puppet/services/rabbitmq.yaml
View File

@ -160,6 +160,7 @@ outputs:
if: if:
- internal_tls_enabled - internal_tls_enabled
- generate_service_certificates: true - generate_service_certificates: true
tripleo::rabbitmq::service_certificate: '/etc/pki/tls/certs/rabbitmq.crt'
tripleo::profile::base::rabbitmq::certificate_specs: tripleo::profile::base::rabbitmq::certificate_specs:
service_certificate: '/etc/pki/tls/certs/rabbitmq.crt' service_certificate: '/etc/pki/tls/certs/rabbitmq.crt'
service_key: '/etc/pki/tls/private/rabbitmq.key' service_key: '/etc/pki/tls/private/rabbitmq.key'
@ -173,6 +174,7 @@ outputs:
template: "rabbitmq/%{hiera('fqdn_NETWORK')}" template: "rabbitmq/%{hiera('fqdn_NETWORK')}"
params: params:
NETWORK: {get_param: [ServiceNetMap, RabbitmqNetwork]} NETWORK: {get_param: [ServiceNetMap, RabbitmqNetwork]}
postsave_cmd: "/usr/bin/certmonger-rabbitmq-refresh.sh"
- {} - {}
step_config: | step_config: |
include ::tripleo::profile::base::rabbitmq include ::tripleo::profile::base::rabbitmq