Merge pull request redhat-openstack#280 from cmurphy/ssl

Installation of the rabbitmqadmin script fails when SSL is enabled. This...
jguiditta · Dec 17, 2014 · ac046ee · ac046ee
2 parents 26a74ae + 2ece861
commit ac046ee
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/manifests/install/rabbitmqadmin.pp b/manifests/install/rabbitmqadmin.pp
@@ -1,15 +1,21 @@
 #
 class rabbitmq::install::rabbitmqadmin {
 
-  $management_port = $rabbitmq::management_port
+  if($rabbitmq::ssl) {
+    $management_port = $rabbitmq::ssl_management_port
+  }
+  else {
+    $management_port = $rabbitmq::management_port
+  }
+
   $default_user = $rabbitmq::default_user
   $default_pass = $rabbitmq::default_pass
   $protocol = $rabbitmq::ssl ? { false => 'http', default => 'https' }
 
   staging::file { 'rabbitmqadmin':
     target      => '/var/lib/rabbitmq/rabbitmqadmin',
     source      => "${protocol}://${default_user}:${default_pass}@localhost:${management_port}/cli/rabbitmqadmin",
-    curl_option => '--noproxy localhost',
+    curl_option => '-k --noproxy localhost',
     wget_option => '--no-proxy',
     require     => [
       Class['rabbitmq::service'],