1
0
mirror of https://github.com/openshift/openshift-ansible.git synced 2026-02-05 15:45:57 +01:00

Merge branch 'devel-40' into devel-40-master-rebase

This commit is contained in:
Vadim Rutkovsky
2018-12-13 09:02:49 +01:00
committed by GitHub
10 changed files with 373 additions and 6 deletions

View File

@@ -44,7 +44,7 @@
tasks:
# This is required for openshift_node40/config.yml
- set_fact:
openshift_bootstrap_endpoint: "https://{{ mcd_endpoint }}/config/master"
openshift_bootstrap_endpoint: "https://{{ openshift_master_cluster_hostname }}:{{ mcd_port }}/config/master"
- name: Wait for bootstrap endpoint to show up
uri:
url: "{{ openshift_bootstrap_endpoint }}"
@@ -70,7 +70,7 @@
tasks:
# This is required for openshift_node40/config.yml
- set_fact:
openshift_bootstrap_endpoint: "https://{{ mcd_endpoint }}/config/worker"
openshift_bootstrap_endpoint: "https://{{ openshift_master_cluster_hostname }}:{{ mcd_port }}/config/worker"
- name: Wait for bootstrap endpoint to show up
uri:
url: "{{ openshift_bootstrap_endpoint }}"
@@ -170,5 +170,3 @@
- fail:
msg: Required operators didn't complete the install
when: operator.failed
- pause: {}