diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-11-21 14:31:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-21 14:31:05 -0500 |
| commit | e2d6fe37d6a599715d3136cd396ca8f27b5fb9b7 (patch) | |
| tree | caddeb6e2dd712dbefb014bcd8598f91ce0383ce /playbooks/common | |
| parent | f5d74f47e0c22c24ca9f34f9a979c730d8e6ffd3 (diff) | |
| parent | 448c33754c7b5e7cde997a20e137825e85dde6d2 (diff) | |
| download | openshift-e2d6fe37d6a599715d3136cd396ca8f27b5fb9b7.tar.gz openshift-e2d6fe37d6a599715d3136cd396ca8f27b5fb9b7.tar.bz2 openshift-e2d6fe37d6a599715d3136cd396ca8f27b5fb9b7.tar.xz openshift-e2d6fe37d6a599715d3136cd396ca8f27b5fb9b7.zip | |
Merge pull request #2827 from abutcher/BZ1377619
Allow ansible to continue when a node is unaccessible or fails.
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/initialize_facts.yml | 6 | ||||
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 34 |
2 files changed, 7 insertions, 33 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_facts.yml b/playbooks/common/openshift-cluster/initialize_facts.yml index 6d83d2527..18f99728c 100644 --- a/playbooks/common/openshift-cluster/initialize_facts.yml +++ b/playbooks/common/openshift-cluster/initialize_facts.yml @@ -1,7 +1,11 @@ --- +- name: Ensure that all non-node hosts are accessible + hosts: oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config:oo_nfs_to_config + any_errors_fatal: true + tasks: + - name: Initialize host facts hosts: oo_all_hosts - any_errors_fatal: true roles: - openshift_facts tasks: diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index 4824eeef3..e28da5713 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/playbooks/common/openshift-node/config.yml @@ -139,6 +139,8 @@ - role: nuage_node when: openshift.common.use_nuage | bool - role: nickhammond.logrotate + - role: openshift_manage_node + openshift_master_host: "{{ groups.oo_first_master.0 }}" tasks: - name: Create group for deployment type group_by: key=oo_nodes_deployment_type_{{ openshift.common.deployment_type }} @@ -152,35 +154,3 @@ tasks: - file: name={{ mktemp.stdout }} state=absent changed_when: False - -- name: Set node schedulability - hosts: oo_first_master - vars: - openshift_nodes: "{{ groups.oo_nodes_to_config | default([]) }}" - pre_tasks: - # 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 --silent --tlsv1.2 - {% if openshift.common.version_gte_3_2_or_1_2 | bool %} - --cacert {{ openshift.common.config_base }}/master/ca-bundle.crt - {% else %} - --cacert {{ openshift.common.config_base }}/master/ca.crt - {% endif %} - {{ openshift.master.api_url }}/healthz/ready - args: - # Disables the following warning: - # Consider using get_url or uri module rather than running curl - warn: no - register: api_available_output - until: api_available_output.stdout == 'ok' - retries: 120 - delay: 1 - changed_when: false - when: openshift.common.is_containerized | bool - roles: - - openshift_manage_node |