Merge pull request redhat-openstack#245 from ArloL/patch-1

Output cacertfile value only if it is set
jguiditta · Dec 5, 2014 · 3ff4dd1 · 3ff4dd1
2 parents 50b9411 + c7a1cbb
commit 3ff4dd1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/templates/rabbitmq.config.erb b/templates/rabbitmq.config.erb
@@ -17,7 +17,7 @@
 <%- end -%>
 <%- if @ssl -%>
     {ssl_listeners, [<%= @ssl_port %>]},
-    {ssl_options, [{cacertfile,"<%= @ssl_cacert %>"},
+    {ssl_options, [<%- if @ssl_cacert != 'UNSET' -%>{cacertfile,"<%= @ssl_cacert %>"},<%- end -%>
                     {certfile,"<%= @ssl_cert %>"},
                     {keyfile,"<%= @ssl_key %>"},
                     {verify,<%= @ssl_verify %>},
@@ -41,7 +41,7 @@
 <%- if @ssl -%>
       {port, <%= @ssl_management_port %>},
       {ssl, true},
-      {ssl_opts, [{cacertfile, "<%= @ssl_cacert %>"},
+      {ssl_opts, [<%- if @ssl_cacert != 'UNSET' -%>{cacertfile, "<%= @ssl_cacert %>"},<%- end -%>
                   {certfile, "<%= @ssl_cert %>"},
                   {keyfile, "<%= @ssl_key %>"}]}
 <%- else -%>