From d9976f60dad054b08d3e74b20e0bdaed1c6f8539 Mon Sep 17 00:00:00 2001 From: TimurNurlygayanov Date: Thu, 24 Oct 2013 13:31:03 +0400 Subject: [PATCH] Fixed https://bugs.launchpad.net/murano/+bug/1244109 Change-Id: I996fb96fe7c98da9fb5b3c2b2614abe1d959844c --- etc/conductor.conf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/etc/conductor.conf b/etc/conductor.conf index 1af8b22..6c346f5 100644 --- a/etc/conductor.conf +++ b/etc/conductor.conf @@ -21,22 +21,22 @@ auth_url = http://localhost:5000/v2.0 # Keystone SSL parameters # Optional CA cert file to use in SSL connections -ca_file = +#ca_file = # Optional PEM-formatted certificate chain file -cert_file = +#cert_file = # Optional PEM-formatted file that contains the private key -key_file = +#key_file = # If set then the server's certificate will not be verified insecure = False [heat] # Heat SSL parameters # Optional CA cert file to use in SSL connections -ca_file = +#ca_file = # Optional PEM-formatted certificate chain file -cert_file = +#cert_file = # Optional PEM-formatted file that contains the private key -key_file = +#key_file = # If set then the server's certificate will not be verified insecure = False # Valid endpoint types: publicURL (default), internalURL, adminURL @@ -56,7 +56,7 @@ port = 5672 ssl = False # Path to SSL CA certificate or empty to allow self signed server certificate -ca_certs = +#ca_certs = # RabbitMQ credentials. Fresh RabbitMQ installation has "guest" account with "guest" password. # It is recommended to create dedicated user account for Murano using RabbitMQ web console or command line utility @@ -65,4 +65,4 @@ password = guest # RabbitMQ virtual host (vhost). Fresh RabbitMQ installation has "/" vhost preconfigured. # It is recommended to create dedicated vhost for Murano using RabbitMQ web console or command line utility -virtual_host = / \ No newline at end of file +virtual_host = /