openstack/openstack-ansible-os_ironic
Code Issues Proposed changes

Merge "Support service-specific rabbitmq clusters"

Browse Source
This commit is contained in:
Jenkins 2016-07-22 12:04:15 +00:00 committed by Gerrit Code Review
commit d86aeb65cb
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -148,6 +148,9 @@ ironic_pip_packages:
## RabbitMQ info ## RabbitMQ info
ironic_rabbitmq_userid: ironic ironic_rabbitmq_userid: ironic
ironic_rabbitmq_vhost: /ironic ironic_rabbitmq_vhost: /ironic
ironic_rabbitmq_servers: 127.0.0.1
ironic_rabbitmq_use_ssl: False
ironic_rabbitmq_port: 5672
# Auth # Auth
ironic_service_user_name: "ironic" ironic_service_user_name: "ironic"

6
templates/ironic.conf.j2
View File

@ -122,12 +122,12 @@ lock_path = /var/lock/ironic
[oslo_messaging_notifications] [oslo_messaging_notifications]
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
rabbit_port = {{ rabbitmq_port }} rabbit_port = {{ ironic_rabbitmq_port }}
rabbit_userid = {{ ironic_rabbitmq_userid }} rabbit_userid = {{ ironic_rabbitmq_userid }}
rabbit_password = {{ ironic_rabbitmq_password }} rabbit_password = {{ ironic_rabbitmq_password }}
rabbit_virtual_host = {{ ironic_rabbitmq_vhost }} rabbit_virtual_host = {{ ironic_rabbitmq_vhost }}
rabbit_hosts = {{ rabbitmq_servers }} rabbit_hosts = {{ ironic_rabbitmq_servers }}
rabbit_use_ssl = {{ rabbitmq_use_ssl }} rabbit_use_ssl = {{ ironic_rabbitmq_use_ssl }}
pool_max_size = {{ ironic_wsgi_processes }} pool_max_size = {{ ironic_wsgi_processes }}

3
tests/test-vars.yml
View File

@ -67,6 +67,9 @@ ironic_galera_password: "secrete"
ironic_rabbitmq_password: "secrete" ironic_rabbitmq_password: "secrete"
ironic_rabbitmq_userid: ironic ironic_rabbitmq_userid: ironic
ironic_rabbitmq_vhost: /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_standalone: True
ironic_swift_endpoint: "http://localhost:8080" ironic_swift_endpoint: "http://localhost:8080"
ironic_swift_auth_account: "AUTH_1234567890" ironic_swift_auth_account: "AUTH_1234567890"