Add missing parts for rabbitmq ssl configuration
With this patch cacert/ssl chiphers will be configured correctly.
Change-Id: I4f2a8aa5c95d54cb3b039f3c8b60cb8aad6c0a92
diff --git a/ceilometer/files/pike/ceilometer-agent.conf.Debian b/ceilometer/files/pike/ceilometer-agent.conf.Debian
index 7b3d4ac..1beefe8 100644
--- a/ceilometer/files/pike/ceilometer-agent.conf.Debian
+++ b/ceilometer/files/pike/ceilometer-agent.conf.Debian
@@ -50,6 +50,20 @@
topics = notifications
+[oslo_messaging_rabbit]
+
+{%- if agent.message_queue.get('ssl',{}).get('enabled', False) %}
+rabbit_use_ssl=true
+
+{%- if agent.message_queue.ssl.version is defined %}
+kombu_ssl_version = {{ agent.message_queue.ssl.version }}
+{%- elif salt['grains.get']('pythonversion') > [2,7,8] %}
+kombu_ssl_version = TLSv1_2
+{%- endif %}
+
+kombu_ssl_ca_certs = {{ agent.message_queue.ssl.get('cacert_file', agent.cacert_file) }}
+{%- endif %}
+
[service_credentials]
auth_type = password
diff --git a/ceilometer/files/pike/ceilometer-server.conf.Debian b/ceilometer/files/pike/ceilometer-server.conf.Debian
index 054c981..a2a52a9 100644
--- a/ceilometer/files/pike/ceilometer-server.conf.Debian
+++ b/ceilometer/files/pike/ceilometer-server.conf.Debian
@@ -160,6 +160,20 @@
topics = notifications
+[oslo_messaging_rabbit]
+
+{%- if server.message_queue.get('ssl',{}).get('enabled', False) %}
+rabbit_use_ssl=true
+
+{%- if server.message_queue.ssl.version is defined %}
+kombu_ssl_version = {{ server.message_queue.ssl.version }}
+{%- elif salt['grains.get']('pythonversion') > [2,7,8] %}
+kombu_ssl_version = TLSv1_2
+{%- endif %}
+
+kombu_ssl_ca_certs = {{ server.message_queue.ssl.get('cacert_file', server.cacert_file) }}
+{%- endif %}
+
[publisher]
{%- if server.secret is defined %}
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index d7f2242..e4034f8 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -157,7 +157,8 @@
prepare() {
[ -d ${BUILDDIR} ] && mkdir -p ${BUILDDIR}
- [[ ! -f "${VENV_DIR}/bin/activate" ]] && setup_virtualenv
+ # On ci salt is preinstalled from packages, so use it if present
+ which salt-call || setup_virtualenv
setup_mock_bin
setup_pillar
setup_salt
@@ -271,4 +272,4 @@
run
# run_model_validate
;;
-esac
\ No newline at end of file
+esac