openstack/openstack-ansible
Code Issues Proposed changes

Moving neutron play vars to the group_vars for neutron

Browse Source 
This should aid maintainability by putting the vars
in a single place within the codebase.

Variables remaining in the os-neutron-install play
are either play-specific or do not necessarily belong
within the neutron group_vars

Change-Id: Ia5edd6078c956e2d21804de8f5b244445a31ad45
This commit is contained in:
Travis Truman 2016-07-08 16:29:53 -04:00 committed by Kevin Carter (cloudnull)
parent 55101030f2
commit 54555431af
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
playbooks/inventory/group_vars/neutron_all.yml
View File

@ -15,3 +15,13 @@
neutron_dhcp_domain: "{{ dhcp_domain }}"
neutron_service_in_ldap: "{{ service_ldap_backend_enabled }}"
neutron_galera_user: neutron
neutron_galera_database: neutron
neutron_galera_address: "{{ galera_address }}"
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 }}"

12
playbooks/os-neutron-install.yml
View File

@ -65,7 +65,7 @@
dist_sort:
value_to_lookup: "{{ container_name }}"
ref_list: "{{ groups['neutron_all'] }}"
src_list: "{{ rabbitmq_servers }}"
src_list: "{{ neutron_rabbitmq_servers }}"
register: servers
tags:
- always
@ -189,6 +189,7 @@
neutron_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/neutron-{{ openstack_release }}.tgz"
neutron_overlay_network: "{{ _overlay_network }}"
neutron_provider_networks: "{{ _provider_networks }}"
neutron_local_ip: "{{ _local_ip|default('127.0.0.1') }}"
tags:
- "os-neutron"
- { role: "openstack_openrc", tags: [ "openstack-openrc" ] }
@ -207,14 +208,5 @@
- "system-crontab-coordination"
vars:
is_metal: "{{ properties.is_metal|default(false) }}"
neutron_galera_user: neutron
neutron_galera_database: neutron
neutron_galera_address: "{{ galera_address }}"
neutron_local_ip: "{{ _local_ip|default('127.0.0.1') }}"
bind_prefix: "{{ provider_network_bind_prefix|default('') }}"
neutron_rabbitmq_userid: neutron
neutron_rabbitmq_vhost: /neutron
neutron_rabbitmq_servers: "{{ rabbitmq_servers }}"
neutron_rabbitmq_port: "{{ rabbitmq_port }}"
neutron_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"