openstack/openstack-ansible
Code Issues Proposed changes

Merge "Add Neutron variables shared with Octavia"

Browse Source
This commit is contained in:
Zuul 2017-10-31 14:26:57 +00:00 committed by Gerrit Code Review
commit e319a00aaa
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
group_vars/all/neutron.yml
View File

@ -25,3 +25,11 @@ neutron_service_region: "{{ service_region }}"
# Horizon consumes this var so it must be in the global vars namespace # Horizon consumes this var so it must be in the global vars namespace
neutron_plugin_type: ml2.lxb neutron_plugin_type: ml2.lxb
# RPC - for Octavia event streamer.
neutron_rabbitmq_userid: neutron
neutron_rabbitmq_vhost: /neutron
neutron_rabbitmq_port: "{{ rabbitmq_port }}"
neutron_rabbitmq_servers: "{{ rabbitmq_servers }}"
neutron_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
neutron_rabbitmq_host_group: "{{ rabbitmq_host_group }}"

8
group_vars/neutron_all.yml
View File

@ -16,14 +16,6 @@
# These are here rather than in neutron_all because # These are here rather than in neutron_all because
# both the os_ceilometer and os_neutron roles require them # both the os_ceilometer and os_neutron roles require them
# RPC
neutron_rabbitmq_userid: neutron
neutron_rabbitmq_vhost: /neutron
neutron_rabbitmq_port: "{{ rabbitmq_port }}"
neutron_rabbitmq_servers: "{{ rabbitmq_servers }}"
neutron_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
neutron_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
# Telemetry notifications # Telemetry notifications
neutron_rabbitmq_telemetry_userid: "{{ neutron_rabbitmq_userid }}" neutron_rabbitmq_telemetry_userid: "{{ neutron_rabbitmq_userid }}"
neutron_rabbitmq_telemetry_password: "{{ neutron_rabbitmq_password }}" neutron_rabbitmq_telemetry_password: "{{ neutron_rabbitmq_password }}"