summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Mountain <eric.mountain@amadeus.com>2015-12-14 10:35:35 +0100
committerEric Mountain <eric.mountain@amadeus.com>2015-12-14 10:44:32 +0100
commit0b61ab55596415bd1b463f52a4110f46897d2352 (patch)
tree0160e9e00e6baa1f8f558788fc71eb18765aaf36
parent40ce28e760021571504efe3b89a4034b98c64f4b (diff)
downloadopenshift-0b61ab55596415bd1b463f52a4110f46897d2352.tar.gz
openshift-0b61ab55596415bd1b463f52a4110f46897d2352.tar.bz2
openshift-0b61ab55596415bd1b463f52a4110f46897d2352.tar.xz
openshift-0b61ab55596415bd1b463f52a4110f46897d2352.zip
Fixes typo when setting facts to record whether master/node has been restarted already, to decide whether notify handler should do so or not.
Currently, this causes random SDN network setup failures as openshift-node gets restarted while the setup script is running, and the subsequent start fails to configure the SDN because it thinks it's already done.
-rw-r--r--roles/openshift_master/tasks/main.yml6
-rw-r--r--roles/openshift_node/tasks/main.yml2
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 8995863ec..43647cc49 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -228,7 +228,7 @@
register: start_result
- set_fact:
- master_service_status_changed = start_result | changed
+ master_service_status_changed: start_result | changed
when: not openshift_master_ha | bool
- name: Start and enable master api
@@ -237,7 +237,7 @@
register: start_result
- set_fact:
- master_api_service_status_changed = start_result | changed
+ master_api_service_status_changed: start_result | changed
when: openshift_master_ha | bool and openshift.master.cluster_method == 'native'
- name: Start and enable master controller
@@ -246,7 +246,7 @@
register: start_result
- set_fact:
- master_controllers_service_status_changed = start_result | changed
+ master_controllers_service_status_changed: start_result | changed
when: openshift_master_ha | bool and openshift.master.cluster_method == 'native'
- name: Install cluster packages
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index eef7bec9a..f8711d15a 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -131,4 +131,4 @@
register: start_result
- set_fact:
- node_service_status_changed = start_result | changed
+ node_service_status_changed: start_result | changed