From 83ec5ce228c769fd7252600961fa5b142af00cd9 Mon Sep 17 00:00:00 2001 From: Russell Teague Date: Wed, 25 Jan 2017 14:29:15 -0500 Subject: Standardize add_host: with name and changed_when The add_host: task does not change any data on the host and as practice has been configured to changed_when: False. This commit standardizes that usage in the byo and common playbooks. Additionally, taks names are added to each task to improve troubleshooting. --- playbooks/byo/openshift-cluster/config.yml | 3 ++- playbooks/byo/openshift-cluster/enable_dnsmasq.yml | 4 +++- playbooks/byo/openshift-cluster/openshift-logging.yml | 4 +++- playbooks/byo/openshift-cluster/redeploy-certificates.yml | 4 +++- playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml | 5 +++-- playbooks/byo/openshift-cluster/upgrades/upgrade_etcd.yml | 4 +++- playbooks/byo/openshift-master/restart.yml | 6 ++++-- playbooks/byo/openshift-master/scaleup.yml | 6 ++++-- playbooks/byo/openshift-node/network_manager.yml | 6 ++++-- playbooks/byo/openshift-node/scaleup.yml | 6 ++++-- playbooks/byo/openshift_facts.yml | 6 ++++-- playbooks/byo/rhel_subscribe.yml | 6 ++++-- 12 files changed, 41 insertions(+), 19 deletions(-) (limited to 'playbooks/byo') diff --git a/playbooks/byo/openshift-cluster/config.yml b/playbooks/byo/openshift-cluster/config.yml index 5d90da28a..d953b8ed3 100644 --- a/playbooks/byo/openshift-cluster/config.yml +++ b/playbooks/byo/openshift-cluster/config.yml @@ -8,7 +8,8 @@ - always tasks: - include_vars: ../../byo/openshift-cluster/cluster_hosts.yml - - add_host: + - name: Evaluate group l_oo_all_hosts + add_host: name: "{{ item }}" groups: l_oo_all_hosts with_items: "{{ g_all_hosts | default([]) }}" diff --git a/playbooks/byo/openshift-cluster/enable_dnsmasq.yml b/playbooks/byo/openshift-cluster/enable_dnsmasq.yml index fab3e111f..410f70d74 100644 --- a/playbooks/byo/openshift-cluster/enable_dnsmasq.yml +++ b/playbooks/byo/openshift-cluster/enable_dnsmasq.yml @@ -5,10 +5,12 @@ gather_facts: no tasks: - include_vars: ../../byo/openshift-cluster/cluster_hosts.yml - - add_host: + - name: Evaluate group l_oo_all_hosts + add_host: name: "{{ item }}" groups: l_oo_all_hosts with_items: "{{ g_all_hosts | default([]) }}" + changed_when: False - hosts: l_oo_all_hosts gather_facts: no diff --git a/playbooks/byo/openshift-cluster/openshift-logging.yml b/playbooks/byo/openshift-cluster/openshift-logging.yml index 09ab91bbd..3a18e800e 100644 --- a/playbooks/byo/openshift-cluster/openshift-logging.yml +++ b/playbooks/byo/openshift-cluster/openshift-logging.yml @@ -15,10 +15,12 @@ - always tasks: - include_vars: ../../byo/openshift-cluster/cluster_hosts.yml - - add_host: + - name: Evaluate group l_oo_all_hosts + add_host: name: "{{ item }}" groups: l_oo_all_hosts with_items: "{{ g_all_hosts | default([]) }}" + changed_when: False - name: Create initial host groups for all hosts hosts: l_oo_all_hosts diff --git a/playbooks/byo/openshift-cluster/redeploy-certificates.yml b/playbooks/byo/openshift-cluster/redeploy-certificates.yml index 73d9baadb..8422789b1 100644 --- a/playbooks/byo/openshift-cluster/redeploy-certificates.yml +++ b/playbooks/byo/openshift-cluster/redeploy-certificates.yml @@ -5,10 +5,12 @@ gather_facts: no tasks: - include_vars: ../../byo/openshift-cluster/cluster_hosts.yml - - add_host: + - name: Evaluate group l_oo_all_hosts + add_host: name: "{{ item }}" groups: l_oo_all_hosts with_items: "{{ g_all_hosts | default([]) }}" + changed_when: False - hosts: l_oo_all_hosts gather_facts: no diff --git a/playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml index d337b6f75..6de054937 100644 --- a/playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml @@ -6,11 +6,12 @@ gather_facts: no tasks: - include_vars: ../../cluster_hosts.yml - - add_host: + - name: Evaluate group l_oo_all_hosts + add_host: name: "{{ item }}" groups: l_oo_all_hosts with_items: "{{ g_all_hosts | default([]) }}" - changed_when: false + changed_when: False - hosts: l_oo_all_hosts gather_facts: no diff --git a/playbooks/byo/openshift-cluster/upgrades/upgrade_etcd.yml b/playbooks/byo/openshift-cluster/upgrades/upgrade_etcd.yml index a365ae994..106dcc12d 100644 --- a/playbooks/byo/openshift-cluster/upgrades/upgrade_etcd.yml +++ b/playbooks/byo/openshift-cluster/upgrades/upgrade_etcd.yml @@ -8,10 +8,12 @@ - always tasks: - include_vars: ../cluster_hosts.yml - - add_host: + - name: Evaluate group l_oo_all_hosts + add_host: name: "{{ item }}" groups: l_oo_all_hosts with_items: "{{ g_all_hosts | default([]) }}" + changed_when: False - name: Create initial host groups for all hosts hosts: l_oo_all_hosts diff --git a/playbooks/byo/openshift-master/restart.yml b/playbooks/byo/openshift-master/restart.yml index b60807a71..c468a898d 100644 --- a/playbooks/byo/openshift-master/restart.yml +++ b/playbooks/byo/openshift-master/restart.yml @@ -5,10 +5,12 @@ gather_facts: no tasks: - include_vars: ../../byo/openshift-cluster/cluster_hosts.yml - - add_host: + - name: Evaluate group l_oo_all_hosts + add_host: name: "{{ item }}" groups: l_oo_all_hosts - with_items: "{{ g_all_hosts }}" + with_items: "{{ g_all_hosts | default([]) }}" + changed_when: False - hosts: l_oo_all_hosts gather_facts: no diff --git a/playbooks/byo/openshift-master/scaleup.yml b/playbooks/byo/openshift-master/scaleup.yml index 279eeab21..cb9140ee2 100644 --- a/playbooks/byo/openshift-master/scaleup.yml +++ b/playbooks/byo/openshift-master/scaleup.yml @@ -5,10 +5,12 @@ gather_facts: no tasks: - include_vars: ../../byo/openshift-cluster/cluster_hosts.yml - - add_host: + - name: Evaluate group l_oo_all_hosts + add_host: name: "{{ item }}" groups: l_oo_all_hosts - with_items: "{{ g_all_hosts }}" + with_items: "{{ g_all_hosts | default([]) }}" + changed_when: False - hosts: l_oo_all_hosts gather_facts: no diff --git a/playbooks/byo/openshift-node/network_manager.yml b/playbooks/byo/openshift-node/network_manager.yml index 344b22240..7c453986e 100644 --- a/playbooks/byo/openshift-node/network_manager.yml +++ b/playbooks/byo/openshift-node/network_manager.yml @@ -5,10 +5,12 @@ gather_facts: no tasks: - include_vars: ../../byo/openshift-cluster/cluster_hosts.yml - - add_host: + - name: Evaluate group l_oo_all_hosts + add_host: name: "{{ item }}" groups: l_oo_all_hosts - with_items: "{{ g_all_hosts }}" + with_items: "{{ g_all_hosts | default([]) }}" + changed_when: False - hosts: l_oo_all_hosts become: yes diff --git a/playbooks/byo/openshift-node/scaleup.yml b/playbooks/byo/openshift-node/scaleup.yml index d8556c94d..1f2509a67 100644 --- a/playbooks/byo/openshift-node/scaleup.yml +++ b/playbooks/byo/openshift-node/scaleup.yml @@ -5,10 +5,12 @@ gather_facts: no tasks: - include_vars: ../../byo/openshift-cluster/cluster_hosts.yml - - add_host: + - name: Evaluate group l_oo_all_hosts + add_host: name: "{{ item }}" groups: l_oo_all_hosts - with_items: "{{ g_all_hosts }}" + with_items: "{{ g_all_hosts | default([]) }}" + changed_when: False - hosts: l_oo_all_hosts gather_facts: no diff --git a/playbooks/byo/openshift_facts.yml b/playbooks/byo/openshift_facts.yml index d1acf6175..50936941a 100644 --- a/playbooks/byo/openshift_facts.yml +++ b/playbooks/byo/openshift_facts.yml @@ -5,10 +5,12 @@ gather_facts: no tasks: - include_vars: openshift-cluster/cluster_hosts.yml - - add_host: + - name: Evaluate group l_oo_all_hosts + add_host: name: "{{ item }}" groups: l_oo_all_hosts - with_items: "{{ g_all_hosts }}" + with_items: "{{ g_all_hosts | default([]) }}" + changed_when: False - hosts: l_oo_all_hosts gather_facts: no diff --git a/playbooks/byo/rhel_subscribe.yml b/playbooks/byo/rhel_subscribe.yml index 6eeba09d9..e96c43214 100644 --- a/playbooks/byo/rhel_subscribe.yml +++ b/playbooks/byo/rhel_subscribe.yml @@ -5,10 +5,12 @@ gather_facts: no tasks: - include_vars: openshift-cluster/cluster_hosts.yml - - add_host: + - name: Evaluate group l_oo_all_hosts + add_host: name: "{{ item }}" groups: l_oo_all_hosts - with_items: "{{ g_all_hosts }}" + with_items: "{{ g_all_hosts | default([]) }}" + changed_when: False - hosts: l_oo_all_hosts gather_facts: no -- cgit v1.2.3