Skip to content

Sahara Rabbit SSL update #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
frozencemetery wants to merge 1 commit into from
Closed

Sahara Rabbit SSL update #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Puppetfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ mod 'rsync',
:git => 'https://github.com/puppetlabs/puppetlabs-rsync.git'

mod 'sahara',
:commit => '66301097ee42840831f8c8c7cd0482e3e2325df5',
:commit => '11ab1d031cc39cec07f126bfc7c76c9d194678eb',
:git => 'https://github.com/frozencemetery/puppet-sahara.git'

mod 'ssh',
Expand Down
21 changes: 6 additions & 15 deletions sahara/manifests/notify/qpid.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@
#
# [*kombu_ssl_keyfile*]
# (Optional) SSL key file (valid only if SSL enabled).
# Defaults to undef.
# Defaults to ''.
#
# [*kombu_ssl_certfile*]
# (Optional) SSL cert file (valid only if SSL enabled).
# Defaults to undef.
# Defaults to ''.
#
# [*kombu_ssl_ca_certs*]
# (optional) SSL certification authority file (valid only if SSL enabled).
# Defaults to undef.
# Defaults to ''.
#
# [*kombu_reconnect_delay*]
# (Optional) Backoff on cancel notification (valid only if SSL enabled).
Expand All @@ -86,21 +86,12 @@
$qpid_topology_version = 2,
$notification_topics = 'notifications',
$control_exchange = 'openstack',
$kombu_ssl_keyfile = undef,
$kombu_ssl_certfile = undef,
$kombu_ssl_ca_certs = undef,
$kombu_ssl_keyfile = '',
$kombu_ssl_certfile = '',
$kombu_ssl_ca_certs = '',
$kombu_reconnect_delay = '1.0',
) {
if $qpid_protocol == 'ssl' {
if !$kombu_ssl_keyfile {
fail('kombu_ssl_keyfile must be set when using SSL in qpid')
}
if !$kombu_ssl_certfile {
fail('kombu_ssl_certfile must be set when using SSL in qpid')
}
if !$kombu_ssl_ca_certs {
fail('kombu_ca_certs must be set when using SSL in qpid')
}
sahara_config {
'DEFAULT/kombu_ssl_version': value => 'TLSv1';
'DEFAULT/kombu_ssl_keyfile': value => $kombu_ssl_keyfile;
Expand Down
24 changes: 7 additions & 17 deletions sahara/manifests/notify/rabbitmq.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,15 @@
#
# [*kombu_ssl_keyfile*]
# (Optional) SSL key file (valid only if SSL enabled).
# Defaults to undef.
# Defaults to ''.
#
# [*kombu_ssl_certfile*]
# (Optional) SSL cert file (valid only if SSL enabled).
# Defaults to undef.
# Defaults to ''.
#
# [*kombu_ssl_ca_certs*]
# (Optional) SSL certification authority file (valid only if SSL enabled).
# Defaults to undef
#
# (optional) SSL certification authority file (valid only if SSL enabled).
# Defaults to ''.
# [*kombu_reconnect_delay*]
# (Optional) Backoff on cancel notification (valid only if SSL enabled).
# Defaults to '1.0'; floating-point value.
Expand All @@ -92,21 +91,12 @@
$rabbit_max_retries = 0,
$notification_topics = 'notifications',
$control_exchange = 'openstack',
$kombu_ssl_keyfile = undef,
$kombu_ssl_certfile = undef,
$kombu_ssl_ca_certs = undef,
$kombu_ssl_keyfile = '',
$kombu_ssl_certfile = '',
$kombu_ssl_ca_certs = '',
$kombu_reconnect_delay = '1.0',
) {
if $rabbit_use_ssl {
if !$kombu_ssl_keyfile {
fail('kombu_ssl_keyfile must be set when using SSL in rabbit')
}
if !$kombu_ssl_certfile {
fail('kombu_ssl_certfile must be set when using SSL in rabbit')
}
if !$kombu_ssl_ca_certs {
fail('kombu_ssl_ca_certs must be set when using SSL in rabbit')
}
sahara_config {
'DEFAULT/kombu_ssl_version': value => 'TLSv1';
'DEFAULT/kombu_ssl_keyfile': value => $kombu_ssl_keyfile;
Expand Down