summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-10-23 11:00:33 -0400
committerJason DeTiberus <jdetiber@redhat.com>2015-10-23 11:00:33 -0400
commit48889b8ed74abfd070fb5ecad082c4f540f7a3fe (patch)
tree465f7512131ae9e3567e28e049f8f0371062e8c1
parent28060809e10c54bf2edd2f9bf2dd22ce5acfff0a (diff)
downloadopenshift-48889b8ed74abfd070fb5ecad082c4f540f7a3fe.tar.gz
openshift-48889b8ed74abfd070fb5ecad082c4f540f7a3fe.tar.bz2
openshift-48889b8ed74abfd070fb5ecad082c4f540f7a3fe.tar.xz
openshift-48889b8ed74abfd070fb5ecad082c4f540f7a3fe.zip
cleanup naming for skipping master and node restart handlers
-rw-r--r--roles/openshift_master/handlers/main.yml2
-rw-r--r--roles/openshift_master/tasks/main.yml2
-rw-r--r--roles/openshift_node/handlers/main.yml2
-rw-r--r--roles/openshift_node/tasks/main.yml2
4 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_master/handlers/main.yml b/roles/openshift_master/handlers/main.yml
index f00e56908..37028e0f6 100644
--- a/roles/openshift_master/handlers/main.yml
+++ b/roles/openshift_master/handlers/main.yml
@@ -1,4 +1,4 @@
---
- name: restart master
service: name={{ openshift.common.service_type }}-master state=restarted
- when: not (openshift_master_ha | bool or skip_master_restart | default(false))
+ when: (not openshift_master_ha | bool) and (not master_service_status_changed | default(false))
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 90e77e7c2..0b20e054b 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -156,7 +156,7 @@
register: start_result
- set_fact:
- skip_master_restart = start_result | changed
+ master_service_status_changed = start_result | changed
- name: Install cluster packages
yum: pkg=pcs state=present
diff --git a/roles/openshift_node/handlers/main.yml b/roles/openshift_node/handlers/main.yml
index 5638a23c1..447ca85f3 100644
--- a/roles/openshift_node/handlers/main.yml
+++ b/roles/openshift_node/handlers/main.yml
@@ -1,7 +1,7 @@
---
- name: restart node
service: name={{ openshift.common.service_type }}-node state=restarted
- when: not skip_node_restart | default(false)
+ when: not node_service_status_changed | default(false)
- name: restart docker
service: name=docker state=restarted
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index a6e8747a3..a7d63befa 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -129,4 +129,4 @@
register: start_result
- set_fact:
- skip_node_restart = start_result | changed
+ node_service_status_changed = start_result | changed