From 2d1ebb3d223b81bc9c1423f08beaf3f6141e31ad Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Thu, 22 Sep 2016 21:54:14 +0100 Subject: [PATCH] Add ironic_rabbitmq settings to group_vars/all.yml The ironic_rabbitmq_* settings need to be set to the rabbitmq equivalents, in group_vars/all.yml for the rabbitmq settings to be correct for ironic. Change-Id: I00116239900cf71cb303fa5e1b9203365d64fa62 --- playbooks/inventory/group_vars/all.yml | 5 +++++ playbooks/inventory/group_vars/ironic_all.yml | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/playbooks/inventory/group_vars/all.yml b/playbooks/inventory/group_vars/all.yml index 865f399603..a60058d54b 100644 --- a/playbooks/inventory/group_vars/all.yml +++ b/playbooks/inventory/group_vars/all.yml @@ -240,6 +240,11 @@ heat_rabbitmq_telemetry_host_group: "{{ heat_rabbitmq_host_group }}" heat_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}" ## Ironic +ironic_rabbitmq_userid: ironic +ironic_rabbitmq_vhost: /ironic +ironic_rabbitmq_port: "{{ rabbitmq_port }}" +ironic_rabbitmq_servers: "{{ rabbitmq_servers }}" +ironic_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" ironic_rabbitmq_host_group: "{{ rabbitmq_host_group }}" ironic_service_name: ironic ironic_service_proto: http diff --git a/playbooks/inventory/group_vars/ironic_all.yml b/playbooks/inventory/group_vars/ironic_all.yml index b6146bdc6c..d1fc12183b 100644 --- a/playbooks/inventory/group_vars/ironic_all.yml +++ b/playbooks/inventory/group_vars/ironic_all.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -ironic_rabbitmq_vhost: /ironic -ironic_rabbitmq_userid: ironic ironic_galera_database: ironic ironic_galera_user: ironic ironic_service_adminurl: "{{ ironic_service_adminuri }}/v1"