Merge "Move filtered_neutron_services to vars"

This commit is contained in:
Jenkins 2017-04-23 03:45:00 +00:00 committed by Gerrit Code Review
commit 77d16ae185
2 changed files with 9 additions and 13 deletions

View File

@ -41,19 +41,6 @@
tags:
- 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
static: no
when:

View File

@ -24,3 +24,12 @@ neutron_packages_list:
enabled: "{{ neutron_services['neutron-lbaasv2-agent']['group'] in group_names and neutron_lbaasv2 | bool }}"
- packages: "{{ neutron_vpnaas_distro_packages }}"
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 -}}