Simplify group_names variable

As noted in [1] the group_names variable is a top-level variable and
doesn't need to be accessed via the hostvars object.

[1] https://review.openstack.org/#/c/572861/1/playbooks/remote_puppet_adhoc.yaml

Change-Id: Ic895f177019b31da34cdf91a6dd62dc99a649754
This commit is contained in:
Colleen Murphy 2018-06-20 23:53:26 +02:00
parent 0c84fcdb91
commit 5dd32fc501
4 changed files with 7 additions and 7 deletions

View File

@ -5,4 +5,4 @@
- role: puppet
manage_config: True
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
manage_config: True
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
manage_config: True
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
manage_config: True
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"
strategy: free
gather_facts: true
@ -25,7 +25,7 @@
project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"
manage_config: True
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"
strategy: free
gather_facts: true
@ -36,7 +36,7 @@
puppet_timeout: 60m
manage_config: True
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"
strategy: free
gather_facts: true
@ -47,4 +47,4 @@
puppet_timeout: 60m
manage_config: True
puppet_reports: none
futureparser: "{{ True if 'futureparser' in hostvars[inventory_hostname].group_names else False }}"
futureparser: "{{ True if 'futureparser' in group_names else False }}"