diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml index 0e6b05e9e3..13acb1cbb2 100644 --- a/playbooks/groups/os-cluster.yml +++ b/playbooks/groups/os-cluster.yml @@ -109,6 +109,8 @@ openshift_deployment_type: "openshift-enterprise", openshift_cluster_url: "{{ os_url}}", openshift_app_subdomain: "{{ os_app_url }}", + openshift_api_port: 443, + openshift_console_port: 443, when: env == 'staging', tags: ['openshift-cluster','ansible-ansible-openshift-ansible'] } diff --git a/roles/ansible-ansible-openshift-ansible/defaults/main.yml b/roles/ansible-ansible-openshift-ansible/defaults/main.yml index 404e933379..243d855e32 100644 --- a/roles/ansible-ansible-openshift-ansible/defaults/main.yml +++ b/roles/ansible-ansible-openshift-ansible/defaults/main.yml @@ -27,6 +27,11 @@ openshift_ansible_containerized_deploy: false # Example: openshift.fedoraproject.org openshift_cluster_url: None +# OpenShift Console and API listening ports +# These default to 8443 in openshift-ansible +openshift_api_port: 8443 +openshift_console_port: 8443 + # OpenShift Applications Ingress subdomain (OpenShift routes) openshift_app_subdomain: None diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 index 4effb9d7ad..cddce6d487 100644 --- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 +++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 @@ -592,8 +592,14 @@ openshift_master_default_subdomain={{openshift_app_subdomain}} #osm_host_subnet_length=9 # Configure master API and console ports. -#openshift_master_api_port=8443 -#openshift_master_console_port=8443 +# These will default to 8443 +{% if openshift_api_port is defined and openshift_console_port is defined %} +{% if openshift_api port and openshift_console_port %} +openshift_master_api_port={{openshift_api_port}} +openshift_master_console_port={{openshift_console_port}} +{% endif %} +{% endif %} + # set RPM version for debugging purposes #openshift_pkg_version=-3.1.0.0