From b8f4081c2e9b0b6200d06234cec2678e302e6313 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 16 Aug 2018 13:12:20 -0500 Subject: [PATCH] Use ansible group vars for futureparser flag Now that we're running with ansible, we can set the futureparser varible in the group_vars for the futureparser group and stop passing it as a parameter explicitly. Change-Id: I41fe283e96bb48a17f2acfe2ffd939223b5345e7 --- playbooks/group_vars/futureparser.yaml | 1 + playbooks/remote_puppet_adhoc.yaml | 1 - playbooks/remote_puppet_afs.yaml | 1 - playbooks/remote_puppet_else.yaml | 1 - playbooks/remote_puppet_git.yaml | 4 ---- 5 files changed, 1 insertion(+), 7 deletions(-) create mode 100644 playbooks/group_vars/futureparser.yaml diff --git a/playbooks/group_vars/futureparser.yaml b/playbooks/group_vars/futureparser.yaml new file mode 100644 index 0000000000..458719a483 --- /dev/null +++ b/playbooks/group_vars/futureparser.yaml @@ -0,0 +1 @@ +futureparser: true diff --git a/playbooks/remote_puppet_adhoc.yaml b/playbooks/remote_puppet_adhoc.yaml index 85394f60b8..fc11debf07 100644 --- a/playbooks/remote_puppet_adhoc.yaml +++ b/playbooks/remote_puppet_adhoc.yaml @@ -5,4 +5,3 @@ - role: puppet manage_config: True puppet_reports: none - futureparser: "{{ True if 'futureparser' in group_names else False }}" diff --git a/playbooks/remote_puppet_afs.yaml b/playbooks/remote_puppet_afs.yaml index be9e96d332..5657271e0c 100644 --- a/playbooks/remote_puppet_afs.yaml +++ b/playbooks/remote_puppet_afs.yaml @@ -6,4 +6,3 @@ - role: puppet manage_config: True puppet_reports: none - futureparser: "{{ True if 'futureparser' in group_names else False }}" diff --git a/playbooks/remote_puppet_else.yaml b/playbooks/remote_puppet_else.yaml index a00a1fa84b..f7ad594163 100644 --- a/playbooks/remote_puppet_else.yaml +++ b/playbooks/remote_puppet_else.yaml @@ -5,4 +5,3 @@ - role: puppet manage_config: True puppet_reports: none - futureparser: "{{ True if 'futureparser' in group_names else False }}" diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml index 139f8c797c..2a48f8ef23 100644 --- a/playbooks/remote_puppet_git.yaml +++ b/playbooks/remote_puppet_git.yaml @@ -14,7 +14,6 @@ copy_puppet: False manage_config: True puppet_reports: none - futureparser: "{{ True if 'futureparser' in group_names else False }}" - hosts: "git0*:!disabled" strategy: free gather_facts: true @@ -25,7 +24,6 @@ project_config_ref: "{{ hostvars.localhost.gitinfo.after }}" manage_config: True puppet_reports: none - futureparser: "{{ True if 'futureparser' in group_names else False }}" - hosts: "review:!disabled" strategy: free gather_facts: true @@ -36,7 +34,6 @@ puppet_timeout: 60m manage_config: True puppet_reports: none - futureparser: "{{ True if 'futureparser' in group_names else False }}" - hosts: "zuul-scheduler:!disabled" strategy: free gather_facts: true @@ -47,4 +44,3 @@ puppet_timeout: 60m manage_config: True puppet_reports: none - futureparser: "{{ True if 'futureparser' in group_names else False }}"