Skip to content

Commit ac046ee

Browse files
author
Morgan Haskel
committed
Merge pull request redhat-openstack#280 from cmurphy/ssl
Installation of the rabbitmqadmin script fails when SSL is enabled. This...
2 parents 26a74ae + 2ece861 commit ac046ee

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

manifests/install/rabbitmqadmin.pp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
#
22
class rabbitmq::install::rabbitmqadmin {
33

4-
$management_port = $rabbitmq::management_port
4+
if($rabbitmq::ssl) {
5+
$management_port = $rabbitmq::ssl_management_port
6+
}
7+
else {
8+
$management_port = $rabbitmq::management_port
9+
}
10+
511
$default_user = $rabbitmq::default_user
612
$default_pass = $rabbitmq::default_pass
713
$protocol = $rabbitmq::ssl ? { false => 'http', default => 'https' }
814

915
staging::file { 'rabbitmqadmin':
1016
target => '/var/lib/rabbitmq/rabbitmqadmin',
1117
source => "${protocol}://${default_user}:${default_pass}@localhost:${management_port}/cli/rabbitmqadmin",
12-
curl_option => '--noproxy localhost',
18+
curl_option => '-k --noproxy localhost',
1319
wget_option => '--no-proxy',
1420
require => [
1521
Class['rabbitmq::service'],

0 commit comments

Comments
 (0)