summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-01-14 11:29:59 -0500
committerAndrew Butcher <abutcher@redhat.com>2016-01-14 11:59:32 -0500
commite99eda725ba65eeb0d1c13ee1bd3e8737b9d3602 (patch)
tree90a759bc9c102a699b8109fcc93fee92f7cc26ed /roles
parente9bd1b8d47f18eba817f426ae66cb75f32fb40c5 (diff)
downloadopenshift-e99eda725ba65eeb0d1c13ee1bd3e8737b9d3602.tar.gz
openshift-e99eda725ba65eeb0d1c13ee1bd3e8737b9d3602.tar.bz2
openshift-e99eda725ba65eeb0d1c13ee1bd3e8737b9d3602.tar.xz
openshift-e99eda725ba65eeb0d1c13ee1bd3e8737b9d3602.zip
Check api prior to starting node.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_node/tasks/main.yml15
1 files changed, 15 insertions, 0 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 0828d8e2c..9035248f9 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -103,6 +103,21 @@
- name: Additional storage plugin configuration
include: storage_plugins/main.yml
+# Necessary because when you're on a node that's also a master the master will be
+# restarted after the node restarts docker and it will take up to 60 seconds for
+# systemd to start the master again
+- name: Wait for master API to become available before proceeding
+ # Using curl here since the uri module requires python-httplib2 and
+ # wait_for port doesn't provide health information.
+ command: >
+ curl -k --head --silent {{ openshift_node_master_api_url }}
+ register: api_available_output
+ until: api_available_output.stdout.find("200 OK") != -1
+ retries: 120
+ delay: 1
+ changed_when: false
+ when: openshift.common.is_containerized | bool
+
- name: Start and enable node
service: name={{ openshift.common.service_type }}-node enabled=yes state=started
register: start_result