Use mcd_endpoint in deploy_cluster_40 playbook

inventory/dynamic/gcp/group_vars/all/00_defaults.yml

@@ -21,7 +21,7 @@ openshift_master_cluster_public_hostname: "openshift-master.{{ public_hosted_zon
 openshift_master_default_subdomain: "{{ wildcard_zone }}"
 
 mcd_port: 49500
-mcd_endpoint: "{{ openshift_master_cluster_public_hostname }}:{{ mcd_port }}"
+mcd_endpoint: "https://{{ openshift_master_cluster_public_hostname }}:{{ mcd_port }}"
 
 # Cloud specific settings
 openshift_cloudprovider_kind: gce

playbooks/deploy_cluster_40.yml

@@ -44,7 +44,7 @@
   tasks:
   # This is required for openshift_node40/config.yml
   - set_fact:
-      openshift_bootstrap_endpoint: "https://{{ openshift_master_cluster_hostname }}:{{ mcd_port }}/config/master"
+      openshift_bootstrap_endpoint: "{{ mcd_endpoint }}/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://{{ openshift_master_cluster_hostname }}:{{ mcd_port }}/config/worker"
+      openshift_bootstrap_endpoint: "{{ mcd_endpoint }}/config/worker"
   - name: Wait for bootstrap endpoint to show up
     uri:
       url: "{{ openshift_bootstrap_endpoint }}"