summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-26 11:24:23 -0500
committerGitHub <noreply@github.com>2017-01-26 11:24:23 -0500
commita44270f3dfd2c4707138891cfc485e0a82e7dd7c (patch)
treeef508b895ca334b5011ca056ab6a97ba3a42b814 /playbooks/common
parentf644072274a79201b7240154b4d84e352dd51040 (diff)
parent83ec5ce228c769fd7252600961fa5b142af00cd9 (diff)
downloadopenshift-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')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/etcd/main.yml3
-rw-r--r--playbooks/common/openshift-cluster/upgrades/init.yml4
-rw-r--r--playbooks/common/openshift-cluster/upgrades/initialize_nodes_to_upgrade.yml1
-rw-r--r--playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml1
-rw-r--r--playbooks/common/openshift-etcd/service.yml5
-rw-r--r--playbooks/common/openshift-loadbalancer/service.yml5
-rw-r--r--playbooks/common/openshift-master/service.yml5
-rw-r--r--playbooks/common/openshift-nfs/service.yml5
-rw-r--r--playbooks/common/openshift-node/config.yml1
-rw-r--r--playbooks/common/openshift-node/service.yml10
10 files changed, 33 insertions, 7 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
diff --git a/playbooks/common/openshift-etcd/service.yml b/playbooks/common/openshift-etcd/service.yml
index a039d30b8..ced4bddc5 100644
--- a/playbooks/common/openshift-etcd/service.yml
+++ b/playbooks/common/openshift-etcd/service.yml
@@ -9,8 +9,11 @@
when: new_cluster_state is not defined
- name: Evaluate g_service_etcd
- add_host: name={{ item }} groups=g_service_etcd
+ add_host:
+ name: "{{ item }}"
+ groups: g_service_etcd
with_items: "{{ oo_host_group_exp | default([]) }}"
+ changed_when: False
- name: Change etcd state on etcd instance(s)
hosts: g_service_etcd
diff --git a/playbooks/common/openshift-loadbalancer/service.yml b/playbooks/common/openshift-loadbalancer/service.yml
index e413c2b3a..d3762c961 100644
--- a/playbooks/common/openshift-loadbalancer/service.yml
+++ b/playbooks/common/openshift-loadbalancer/service.yml
@@ -9,8 +9,11 @@
when: new_cluster_state is not defined
- name: Evaluate g_service_lb
- add_host: name={{ item }} groups=g_service_lb
+ add_host:
+ name: "{{ item }}"
+ groups: g_service_lb
with_items: "{{ oo_host_group_exp | default([]) }}"
+ changed_when: False
- name: Change state on lb instance(s)
hosts: g_service_lb
diff --git a/playbooks/common/openshift-master/service.yml b/playbooks/common/openshift-master/service.yml
index 43ef8b6a1..48a2731aa 100644
--- a/playbooks/common/openshift-master/service.yml
+++ b/playbooks/common/openshift-master/service.yml
@@ -9,8 +9,11 @@
when: new_cluster_state is not defined
- name: Evaluate g_service_masters
- add_host: name={{ item }} groups=g_service_masters
+ add_host:
+ name: "{{ item }}"
+ groups: g_service_masters
with_items: "{{ oo_host_group_exp | default([]) }}"
+ changed_when: False
- name: Change state on master instance(s)
hosts: g_service_masters
diff --git a/playbooks/common/openshift-nfs/service.yml b/playbooks/common/openshift-nfs/service.yml
index 8c3f32403..b1e35e4b1 100644
--- a/playbooks/common/openshift-nfs/service.yml
+++ b/playbooks/common/openshift-nfs/service.yml
@@ -7,8 +7,11 @@
when: new_cluster_state is not defined
- name: Evaluate g_service_nfs
- add_host: name={{ item }} groups=g_service_nfs
+ add_host:
+ name: "{{ item }}"
+ groups: g_service_nfs
with_items: "{{ oo_host_group_exp | default([]) }}"
+ changed_when: False
- name: Change state on nfs instance(s)
hosts: g_service_nfs
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index b36c0eedf..308a8959d 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -44,6 +44,7 @@
ansible_become: "{{ g_sudo | default(omit) }}"
with_items: "{{ groups.oo_nodes_to_config | default([]) }}"
when: hostvars[item].openshift.common is defined and hostvars[item].openshift.common.is_containerized | bool and (item in groups.oo_nodes_to_config and item in groups.oo_masters_to_config)
+ changed_when: False
- name: Configure containerized nodes
hosts: oo_containerized_master_nodes
diff --git a/playbooks/common/openshift-node/service.yml b/playbooks/common/openshift-node/service.yml
index 2da68ceea..130a5416f 100644
--- a/playbooks/common/openshift-node/service.yml
+++ b/playbooks/common/openshift-node/service.yml
@@ -9,12 +9,18 @@
when: new_cluster_state is not defined
- name: Evaluate g_service_nodes
- add_host: name={{ item }} groups=g_service_nodes
+ add_host:
+ name: "{{ item }}"
+ groups: g_service_nodes
with_items: "{{ oo_host_group_exp | default([]) }}"
+ changed_when: False
- name: Change state on node instance(s)
hosts: g_service_nodes
connection: ssh
gather_facts: no
tasks:
- - service: name={{ service_type }}-node state="{{ new_cluster_state }}"
+ - name: Change state on node instance(s)
+ service:
+ name: "{{ service_type }}-node"
+ state: "{{ new_cluster_state }}"