Merge "Simplify group_names variable"

This commit is contained in:
Zuul 2018-07-02 20:57:44 +00:00 committed by Gerrit Code Review
commit d5e634c889
4 changed files with 7 additions and 7 deletions

View File

@ -5,4 +5,4 @@
- role: puppet - role: puppet
manage_config: True manage_config: True
puppet_reports: none puppet_reports: none
futureparser: "{{ True if 'futureparser' in hostvars[inventory_hostname].group_names else False }}" futureparser: "{{ True if 'futureparser' in group_names else False }}"

View File

@ -6,4 +6,4 @@
- role: puppet - role: puppet
manage_config: True manage_config: True
puppet_reports: none puppet_reports: none
futureparser: "{{ True if 'futureparser' in hostvars[inventory_hostname].group_names else False }}" futureparser: "{{ True if 'futureparser' in group_names else False }}"

View File

@ -5,4 +5,4 @@
- role: puppet - role: puppet
manage_config: True manage_config: True
puppet_reports: none puppet_reports: none
futureparser: "{{ True if 'futureparser' in hostvars[inventory_hostname].group_names else False }}" futureparser: "{{ True if 'futureparser' in group_names else False }}"

View File

@ -14,7 +14,7 @@
copy_puppet: False copy_puppet: False
manage_config: True manage_config: True
puppet_reports: none puppet_reports: none
futureparser: "{{ True if 'futureparser' in hostvars[inventory_hostname].group_names else False }}" futureparser: "{{ True if 'futureparser' in group_names else False }}"
- hosts: "git0*:!disabled" - hosts: "git0*:!disabled"
strategy: free strategy: free
gather_facts: true gather_facts: true
@ -25,7 +25,7 @@
project_config_ref: "{{ hostvars.localhost.gitinfo.after }}" project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"
manage_config: True manage_config: True
puppet_reports: none puppet_reports: none
futureparser: "{{ True if 'futureparser' in hostvars[inventory_hostname].group_names else False }}" futureparser: "{{ True if 'futureparser' in group_names else False }}"
- hosts: "review:!disabled" - hosts: "review:!disabled"
strategy: free strategy: free
gather_facts: true gather_facts: true
@ -36,7 +36,7 @@
puppet_timeout: 60m puppet_timeout: 60m
manage_config: True manage_config: True
puppet_reports: none puppet_reports: none
futureparser: "{{ True if 'futureparser' in hostvars[inventory_hostname].group_names else False }}" futureparser: "{{ True if 'futureparser' in group_names else False }}"
- hosts: "zuul-scheduler:!disabled" - hosts: "zuul-scheduler:!disabled"
strategy: free strategy: free
gather_facts: true gather_facts: true
@ -47,4 +47,4 @@
puppet_timeout: 60m puppet_timeout: 60m
manage_config: True manage_config: True
puppet_reports: none puppet_reports: none
futureparser: "{{ True if 'futureparser' in hostvars[inventory_hostname].group_names else False }}" futureparser: "{{ True if 'futureparser' in group_names else False }}"