diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-02-01 15:57:36 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-01 15:57:36 -0600 |
| commit | 3e7787fc86c997679eb14e1a936336086177b438 (patch) | |
| tree | 51297cfb566d0e1f2e9623cca209ac7aa360b97e /playbooks/common | |
| parent | f6c5d4ca41da66b933b600ae5a871624db92a68e (diff) | |
| parent | c9480811d2222693abe4460ca42c292b289a0ef4 (diff) | |
| download | openshift-3e7787fc86c997679eb14e1a936336086177b438.tar.gz openshift-3e7787fc86c997679eb14e1a936336086177b438.tar.bz2 openshift-3e7787fc86c997679eb14e1a936336086177b438.tar.xz openshift-3e7787fc86c997679eb14e1a936336086177b438.zip | |
Merge branch 'master' into logging_fix_immutable_spec_changes
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_hosted.yml | 12 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/restart_hosts.yml | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml index 34f1a979b..3c4a99887 100644 --- a/playbooks/common/openshift-cluster/openshift_hosted.yml +++ b/playbooks/common/openshift-cluster/openshift_hosted.yml @@ -47,12 +47,16 @@ when: ( openshift.common.version_gte_3_3_or_1_3 | bool ) and ( openshift_hosted_manage_registry | default(true) | bool ) and not (openshift.docker.hosted_registry_insecure | default(false) | bool) - name: Update master-config for publicLoggingURL - hosts: masters:!oo_first_master + hosts: oo_masters_to_config:!oo_first_master + tags: + - hosted pre_tasks: - set_fact: logging_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}" tasks: - - include_role: - name: openshift_hosted_logging - tasks_from: update_master_config + + - block: + - include_role: + name: openshift_hosted_logging + tasks_from: update_master_config when: openshift_hosted_logging_deploy | default(false) | bool diff --git a/playbooks/common/openshift-master/restart_hosts.yml b/playbooks/common/openshift-master/restart_hosts.yml index 832301e3d..475144dbf 100644 --- a/playbooks/common/openshift-master/restart_hosts.yml +++ b/playbooks/common/openshift-master/restart_hosts.yml @@ -10,9 +10,10 @@ - name: Wait for master to restart local_action: module: wait_for - host="{{ inventory_hostname }}" + host="{{ ansible_host }}" state=started delay=10 + timeout=600 become: no # Now that ssh is back up we can wait for API on the remote system, |