diff options
| -rw-r--r-- | roles/openshift_management/tasks/add_container_provider.yml | 14 | 
1 files changed, 13 insertions, 1 deletions
diff --git a/roles/openshift_management/tasks/add_container_provider.yml b/roles/openshift_management/tasks/add_container_provider.yml index 383e6edb5..50a5252cc 100644 --- a/roles/openshift_management/tasks/add_container_provider.yml +++ b/roles/openshift_management/tasks/add_container_provider.yml @@ -10,6 +10,18 @@  - name: Ensure OpenShift facts are loaded    openshift_facts: +- name: Ensure we use openshift_master_cluster_public_hostname if it is available +  set_fact: +    l_cluster_hostname: "{{ openshift.master.cluster_public_hostname }}" +  when: +    - openshift.master.cluster_public_hostname is defined + +- name: Ensure we default to the first master if openshift_master_cluster_public_hostname is unavailable +  set_fact: +    l_cluster_hostname: "{{ openshift.master.cluster_hostname }}" +  when: +    - l_cluster_hostname is not defined +  - name: Ensure the management SA Secrets are read    oc_serviceaccount_secret:      state: list @@ -59,7 +71,7 @@        connection_configurations:          - authentication: {auth_key: "{{ management_bearer_token }}", authtype: bearer, type: AuthToken}            endpoint: {role: default, security_protocol: ssl-without-validation, verify_ssl: 0} -      hostname: "{{ openshift.master.cluster_public_hostname }}" +      hostname: "{{ l_cluster_hostname }}"        name: "{{ openshift_management_project }}"        port: "{{ openshift.master.api_port }}"        type: "ManageIQ::Providers::Openshift::ContainerManager"  | 
