Kaynağa Gözat

Revert the console hostname change

We'll do it in a separate pull request.
Tomas Sedovic 7 yıl önce
ebeveyn
işleme
2e6426bfb8

+ 3 - 3
playbooks/provisioning/openstack/advanced-configuration.md

@@ -108,7 +108,7 @@ Either way, find the `oc` binary and put it in your `PATH`.
 
 
 
 
 ```bash
 ```bash
-oc login --insecure-skip-tls-verify=true https://console.openshift.example.com:8443 -u user -p password
+oc login --insecure-skip-tls-verify=true https://master-0.openshift.example.com:8443 -u user -p password
 oc new-project test
 oc new-project test
 oc new-app --template=cakephp-mysql-example
 oc new-app --template=cakephp-mysql-example
 oc status -v
 oc status -v
@@ -122,7 +122,7 @@ Wait until the build has finished and both pods are deployed and running:
 
 
 ```
 ```
 $ oc status -v
 $ oc status -v
-In project test on server https://console.openshift.example.com:8443
+In project test on server https://master-0.openshift.example.com:8443
 
 
 http://cakephp-mysql-example-test.apps.openshift.example.com (svc/cakephp-mysql-example)
 http://cakephp-mysql-example-test.apps.openshift.example.com (svc/cakephp-mysql-example)
   dc/cakephp-mysql-example deploys istag/cakephp-mysql-example:latest <-
   dc/cakephp-mysql-example deploys istag/cakephp-mysql-example:latest <-
@@ -153,7 +153,7 @@ Its `title` should say: "Welcome to OpenShift".
 
 
 You can also access the OpenShift cluster with a web browser by going to:
 You can also access the OpenShift cluster with a web browser by going to:
 
 
-https://console.openshift.example.com:8443
+https://master-0.openshift.example.com:8443
 
 
 Note that for this to work, the OpenShift nodes must be accessible
 Note that for this to work, the OpenShift nodes must be accessible
 from your computer and it's DNS configuration must use the cruster's
 from your computer and it's DNS configuration must use the cruster's

+ 2 - 2
playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml

@@ -5,8 +5,8 @@ openshift_deployment_type: origin
 openshift_master_default_subdomain: "apps.{{ env_id }}.{{ public_dns_domain }}"
 openshift_master_default_subdomain: "apps.{{ env_id }}.{{ public_dns_domain }}"
 
 
 openshift_master_cluster_method: native
 openshift_master_cluster_method: native
-openshift_master_cluster_public_hostname: "console.{{ env_id }}.{{ public_dns_domain }}"
-openshift_master_cluster_hostname: "{{ openshift_master_cluster_public_hostname }}"
+openshift_master_cluster_hostname: "{{ groups.lb.0|default(groups.masters.0) }}"
+openshift_master_cluster_public_hostname: "{{ groups.lb.0|default(groups.masters.0) }}"
 
 
 osm_default_node_selector: 'region=primary'
 osm_default_node_selector: 'region=primary'