openstack/ansible-hardening
Code Issues Proposed changes

Remove groupby filter to avoid bug

Browse Source 
This patch adjusts the package installation/removal tasks to get around
a bug. Jinja2 now returns namedtuples with the groupby filter and
Ansible is unable to convert that to a usable variable data type with
AST.

Jinja2 bug: pallets/jinja#654
Ansible bug: ansible/ansible#20098
Related-Bug: 1655397
Change-Id: I3ce764bfb643bda58c4b6ad282e71c312f41465e
This commit is contained in:
Major Hayden 2017-01-11 08:48:50 -06:00
parent 4efc57f747
commit ea8a0f04b1
3 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tasks/rhel6stig/apt.yml
View File

@ -104,15 +104,10 @@
- name: Add or remove packages based on STIG requirements
apt:
name: |
{%- set pkg_list = [] %}
{%- for package_dict in item[1] %}
{%- if pkg_list.extend(package_dict.packages) %}{% endif %}
{%- endfor %}
{{ pkg_list }}
state: "{{ item[0] }}"
name: "{{ stig_packages | selectattr('enabled') | selectattr('state', 'equalto', item) | sum(attribute='packages', start=[]) }}"
state: "{{ item }}"
with_items:
- "{{ stig_packages | selectattr('enabled') | groupby('state') }}"
- "{{ stig_packages | selectattr('enabled') | map(attribute='state') | unique | list }}"
tags:
- cat1
- auth

11
tasks/rhel6stig/rpm.yml
View File

@ -100,15 +100,10 @@
- name: Add or remove packages based on STIG requirements
yum:
name: |
{%- set pkg_list = [] %}
{%- for package_dict in item[1] %}
{%- if pkg_list.extend(package_dict.packages) %}{% endif %}
{%- endfor %}
{{ pkg_list }}
state: "{{ item[0] }}"
name: "{{ stig_packages | selectattr('enabled') | selectattr('state', 'equalto', item) | sum(attribute='packages', start=[]) }}"
state: "{{ item }}"
with_items:
- "{{ stig_packages | selectattr('enabled') | groupby('state') }}"
- "{{ stig_packages | selectattr('enabled') | map(attribute='state') | unique | list }}"
tags:
- cat1
- auth

11
tasks/rhel7stig/packages.yml
View File

@ -15,15 +15,10 @@
- name: Add or remove packages based on STIG requirements
package:
name: |
{%- set pkg_list = [] %}
{%- for package_dict in item[1] %}
{%- if pkg_list.extend(package_dict.packages) %}{% endif %}
{%- endfor %}
{{ pkg_list }}
state: "{{ item[0] }}"
name: "{{ stig_packages_rhel7 | selectattr('enabled') | selectattr('state', 'equalto', item) | sum(attribute='packages', start=[]) }}"
state: "{{ item }}"
with_items:
- "{{ stig_packages_rhel7 | selectattr('enabled') | groupby('state') }}"
- "{{ stig_packages_rhel7 | selectattr('enabled') | map(attribute='state') | unique | list }}"
tags:
- cat1
- auth