From ebbc044a48d04b4d03a9ab8ef77d468d12ebc51d Mon Sep 17 00:00:00 2001 From: Travis Truman Date: Mon, 18 Jul 2016 10:41:14 -0400 Subject: [PATCH] Support service-specific rabbitmq clusters All rabbitmq connection vars are now namespaced. Namespace support was previously inconsistent which limited deployer override options. Change-Id: Iccc4839f497ae4868d1234e8fd36220870ad7f04 Implements: blueprint multi-rabbitmq-clusters --- defaults/main.yml | 3 +++ templates/ironic.conf.j2 | 6 +++--- tests/test-vars.yml | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 36883b9d..97d95020 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -148,6 +148,9 @@ ironic_pip_packages: ## RabbitMQ info ironic_rabbitmq_userid: ironic ironic_rabbitmq_vhost: /ironic +ironic_rabbitmq_servers: 127.0.0.1 +ironic_rabbitmq_use_ssl: False +ironic_rabbitmq_port: 5672 # Auth ironic_service_user_name: "ironic" diff --git a/templates/ironic.conf.j2 b/templates/ironic.conf.j2 index 329629b8..2b68ce74 100644 --- a/templates/ironic.conf.j2 +++ b/templates/ironic.conf.j2 @@ -122,12 +122,12 @@ lock_path = /var/lock/ironic [oslo_messaging_notifications] [oslo_messaging_rabbit] -rabbit_port = {{ rabbitmq_port }} +rabbit_port = {{ ironic_rabbitmq_port }} rabbit_userid = {{ ironic_rabbitmq_userid }} rabbit_password = {{ ironic_rabbitmq_password }} rabbit_virtual_host = {{ ironic_rabbitmq_vhost }} -rabbit_hosts = {{ rabbitmq_servers }} -rabbit_use_ssl = {{ rabbitmq_use_ssl }} +rabbit_hosts = {{ ironic_rabbitmq_servers }} +rabbit_use_ssl = {{ ironic_rabbitmq_use_ssl }} pool_max_size = {{ ironic_wsgi_processes }} diff --git a/tests/test-vars.yml b/tests/test-vars.yml index 481e9721..4433185d 100644 --- a/tests/test-vars.yml +++ b/tests/test-vars.yml @@ -67,6 +67,9 @@ ironic_galera_password: "secrete" ironic_rabbitmq_password: "secrete" ironic_rabbitmq_userid: ironic ironic_rabbitmq_vhost: /ironic +ironic_rabbitmq_servers: "{{ rabbitmq_servers }}" +ironic_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" +ironic_rabbitmq_port: "{{ rabbitmq_port }}" ironic_standalone: True ironic_swift_endpoint: "http://localhost:8080" ironic_swift_auth_account: "AUTH_1234567890"