openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Move filtered_neutron_services to vars

Browse Source 
Set a var for filtered_neutron_services instead of using a set fact
task.

Change-Id: I29bac92a82c25ef6dddafba854e3ca4936058926
This commit is contained in:
Jimmy McCrory 2017-04-18 08:09:08 -07:00
parent c8fa21215d
commit 5666b10699
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tasks/main.yml
View File

@ -41,19 +41,6 @@
tags: tags:
- always - always
- name: Set filtered dictionary of neutron services
set_fact:
filtered_neutron_services: >
{%- set services = neutron_services.copy() %}
{%- for key,value in neutron_services.items() %}
{%- if value.group not in group_names or not value.service_en %}
{%- set _ = services.pop(key) %}
{%- endif %}
{%- endfor %}
{{- services -}}
tags:
- always
- include: neutron_ml2_ovs_powervm.yml - include: neutron_ml2_ovs_powervm.yml
static: no static: no
when: when:

9
vars/main.yml
View File

@ -24,3 +24,12 @@ neutron_packages_list:
enabled: "{{ neutron_services['neutron-lbaasv2-agent']['group'] in group_names and neutron_lbaasv2 | bool }}" enabled: "{{ neutron_services['neutron-lbaasv2-agent']['group'] in group_names and neutron_lbaasv2 | bool }}"
- packages: "{{ neutron_vpnaas_distro_packages }}" - packages: "{{ neutron_vpnaas_distro_packages }}"
enabled: "{{ neutron_services['neutron-vpnaas-agent']['group'] in group_names and neutron_vpnaas | bool }}" enabled: "{{ neutron_services['neutron-vpnaas-agent']['group'] in group_names and neutron_vpnaas | bool }}"
filtered_neutron_services: >
{%- set services = neutron_services.copy() %}
{%- for key,value in neutron_services.items() %}
{%- if value.group not in group_names or not value.service_en %}
{%- set _ = services.pop(key) %}
{%- endif %}
{%- endfor %}
{{- services -}}