x
/
fuel-ccp-ironic
Code Issues Proposed changes

Merge "Messaging multi-backend support"

This commit is contained in:
Jenkins 2017-01-30 13:21:41 +00:00 committed by Gerrit Code Review
parent 3ec258a731 d695adaf2c
commit 8f1257dabe
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
service/files/ironic.conf.j2
View File

@ -5,8 +5,6 @@ use_stderr = true
my_ip = {{ network_topology["private"]["address"] }} my_ip = {{ network_topology["private"]["address"] }}
transport_url = rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('rabbitmq', rabbitmq.port) }}
enabled_drivers = {{ ironic.enabled_drivers }} enabled_drivers = {{ ironic.enabled_drivers }}
enabled_network_interfaces = noop,flat enabled_network_interfaces = noop,flat
@ -86,3 +84,6 @@ http_url=http://{{ network_topology["private"]["address"] }}:{{ ironic.ipxe.exte
[ansible] [ansible]
use_ramdisk_callback = {{ ironic.ansible.use_ramdisk_callback }} use_ramdisk_callback = {{ ironic.ansible.use_ramdisk_callback }}
{# messaging macros template #}
{{ oslo_messaging[messaging.backend.rpc]('rpc_config') }}

2
service/ironic-api.yaml
View File

@ -65,7 +65,7 @@ service:
files: files:
- ironic.conf - ironic.conf
dependencies: dependencies:
- rabbitmq - "{{ messaging.dependencies[messaging.backend.rpc] }}"
files: files:
ironic.conf: ironic.conf:
path: /etc/ironic/ironic.conf path: /etc/ironic/ironic.conf