diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-01-26 11:24:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-26 11:24:23 -0500 |
| commit | a44270f3dfd2c4707138891cfc485e0a82e7dd7c (patch) | |
| tree | ef508b895ca334b5011ca056ab6a97ba3a42b814 /playbooks/common/openshift-cluster | |
| parent | f644072274a79201b7240154b4d84e352dd51040 (diff) | |
| parent | 83ec5ce228c769fd7252600961fa5b142af00cd9 (diff) | |
| download | openshift-a44270f3dfd2c4707138891cfc485e0a82e7dd7c.tar.gz openshift-a44270f3dfd2c4707138891cfc485e0a82e7dd7c.tar.bz2 openshift-a44270f3dfd2c4707138891cfc485e0a82e7dd7c.tar.xz openshift-a44270f3dfd2c4707138891cfc485e0a82e7dd7c.zip | |
Merge pull request #3184 from mtnbikenc/add_host_idemp
Standardize add_host: with name and changed_when
Diffstat (limited to 'playbooks/common/openshift-cluster')
4 files changed, 8 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/main.yml b/playbooks/common/openshift-cluster/upgrades/etcd/main.yml index 8268adc2e..fa86d29fb 100644 --- a/playbooks/common/openshift-cluster/upgrades/etcd/main.yml +++ b/playbooks/common/openshift-cluster/upgrades/etcd/main.yml @@ -22,11 +22,14 @@ name: "{{ item }}" groups: etcd_hosts_to_upgrade with_items: "{{ groups.oo_etcd_to_config if groups.oo_etcd_to_config is defined and groups.oo_etcd_to_config | length > 0 else [] }}" + changed_when: False + - name: Evaluate etcd_hosts_to_backup add_host: name: "{{ item }}" groups: etcd_hosts_to_backup with_items: "{{ groups.oo_etcd_to_config if groups.oo_etcd_to_config is defined and groups.oo_etcd_to_config | length > 0 else groups.oo_first_master }}" + changed_when: False - name: Backup etcd before upgrading anything include: backup.yml diff --git a/playbooks/common/openshift-cluster/upgrades/init.yml b/playbooks/common/openshift-cluster/upgrades/init.yml index 76645ff3f..235853b0f 100644 --- a/playbooks/common/openshift-cluster/upgrades/init.yml +++ b/playbooks/common/openshift-cluster/upgrades/init.yml @@ -6,10 +6,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 - name: Include g_*_hosts vars for hosts in group l_oo_all_hosts hosts: l_oo_all_hosts diff --git a/playbooks/common/openshift-cluster/upgrades/initialize_nodes_to_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/initialize_nodes_to_upgrade.yml index 4e375ac26..37c89374c 100644 --- a/playbooks/common/openshift-cluster/upgrades/initialize_nodes_to_upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/initialize_nodes_to_upgrade.yml @@ -38,3 +38,4 @@ ansible_ssh_user: "{{ g_ssh_user | default(omit) }}" ansible_become: "{{ g_sudo | default(omit) }}" with_items: "{{ groups['temp_nodes_to_upgrade'] | default(groups['oo_nodes_to_config']) }}" + changed_when: False diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml index 77b37cdc2..23b976192 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml @@ -12,6 +12,7 @@ name: "{{ item }}" groups: etcd_hosts_to_backup with_items: "{{ groups.oo_etcd_to_config if groups.oo_etcd_to_config is defined and groups.oo_etcd_to_config | length > 0 else groups.oo_first_master }}" + changed_when: False # If facts cache were for some reason deleted, this fact may not be set, and if not set # it will always default to true. This causes problems for the etcd data dir fact detection |