openstack/kolla-ansible
Code Issues Proposed changes

Merge "use_forwarded_for is moved to api group"

Browse Source
This commit is contained in:
Jenkins 2017-02-09 23:06:48 +00:00 committed by Gerrit Code Review
commit ac8a614488
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/nova/templates/nova.conf.j2
View File

@ -3,7 +3,6 @@
debug = {{ nova_logging_debug }} debug = {{ nova_logging_debug }}
log_dir = /var/log/kolla/nova log_dir = /var/log/kolla/nova
use_forwarded_for = true
state_path = /var/lib/nova state_path = /var/lib/nova
@ -61,6 +60,9 @@ compute_monitors=nova.compute.monitors.cpu.virt_driver
transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{% if orchestration_engine == 'KUBERNETES' %}rabbitmq{% else %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}{% endif %}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %} transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{% if orchestration_engine == 'KUBERNETES' %}rabbitmq{% else %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}{% endif %}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
[api]
use_forwarded_for = true
[conductor] [conductor]
workers = {{ openstack_service_workers }} workers = {{ openstack_service_workers }}