Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

add openshift port definitions to a-a-o-a role and os-cluster

Browse source 
Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2017-05-11 20:25:31 +00:00
parent fe7802aa8a
commit 0ef616444b
3 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
playbooks/groups/os-cluster.yml
View file

@ -109,6 +109,8 @@
openshift_deployment_type: "openshift-enterprise", openshift_deployment_type: "openshift-enterprise",
openshift_cluster_url: "{{ os_url}}", openshift_cluster_url: "{{ os_url}}",
openshift_app_subdomain: "{{ os_app_url }}", openshift_app_subdomain: "{{ os_app_url }}",
openshift_api_port: 443,
openshift_console_port: 443,
when: env == 'staging', when: env == 'staging',
tags: ['openshift-cluster','ansible-ansible-openshift-ansible'] tags: ['openshift-cluster','ansible-ansible-openshift-ansible']
} }

5
roles/ansible-ansible-openshift-ansible/defaults/main.yml
View file

@ -27,6 +27,11 @@ openshift_ansible_containerized_deploy: false
# Example: openshift.fedoraproject.org # Example: openshift.fedoraproject.org
openshift_cluster_url: None 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 Applications Ingress subdomain (OpenShift routes)
openshift_app_subdomain: None openshift_app_subdomain: None

10
roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2
View file

@ -592,8 +592,14 @@ openshift_master_default_subdomain={{openshift_app_subdomain}}
#osm_host_subnet_length=9 #osm_host_subnet_length=9
# Configure master API and console ports. # Configure master API and console ports.
#openshift_master_api_port=8443 # These will default to 8443
#openshift_master_console_port=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 # set RPM version for debugging purposes
#openshift_pkg_version=-3.1.0.0 #openshift_pkg_version=-3.1.0.0