infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

move some things around

Browse source
This commit is contained in:
Kevin Fenzi 2018-08-22 21:11:39 +00:00
parent 723a7c35d8
commit 6c88b24e10
1 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,6 +62,20 @@ openshift_deployment_type={{openshift_deployment_type}}
# release. # release.
openshift_release={{openshift_release}} openshift_release={{openshift_release}}
{% if openshift_master_ha is defined %}
{% if openshift_master_ha %}
# Native high availability cluster method with optional load balancer.
# If no lb group is defined, the installer assumes that a load balancer has
# been preconfigured. For installation the value of
# openshift_master_cluster_hostname must resolve to the load balancer
# or to one or all of the masters defined in the inventory if no load
# balancer is present.
openshift_master_cluster_method=native
openshift_master_cluster_hostname={{openshift_internal_cluster_url}}
openshift_master_cluster_public_hostname={{openshift_cluster_url}}
{% endif %}
{% endif %}
# default subdomain to use for exposed routes, you should have wildcard dns # default subdomain to use for exposed routes, you should have wildcard dns
# for *.apps.test.example.com that points at your infra nodes which will run # for *.apps.test.example.com that points at your infra nodes which will run
# your router # your router
@ -71,11 +85,6 @@ openshift_master_default_subdomain={{openshift_app_subdomain}}
{% endif %} {% endif %}
{% endif %} {% endif %}
#Set cluster_hostname to point at your load balancer
openshift_master_cluster_hostname=ose3-lb.test.example.com
############################################################################### ###############################################################################
# Additional configuration variables follow # # Additional configuration variables follow #
############################################################################### ###############################################################################
@ -360,20 +369,6 @@ openshift_master_identity_providers=[{"name": "fedoraidp", "login": "true", "cha
# Set cockpit plugins # Set cockpit plugins
#osm_cockpit_plugins=['cockpit-kubernetes'] #osm_cockpit_plugins=['cockpit-kubernetes']
{% if openshift_master_ha is defined %}
{% if openshift_master_ha %}
# Native high availability cluster method with optional load balancer.
# If no lb group is defined, the installer assumes that a load balancer has
# been preconfigured. For installation the value of
# openshift_master_cluster_hostname must resolve to the load balancer
# or to one or all of the masters defined in the inventory if no load
# balancer is present.
openshift_master_cluster_method=native
openshift_master_cluster_hostname={{openshift_internal_cluster_url}}
openshift_master_cluster_public_hostname={{openshift_cluster_url}}
{% endif %}
{% endif %}
# If an external load balancer is used public hostname should resolve to # If an external load balancer is used public hostname should resolve to
# external load balancer address # external load balancer address
#openshift_master_cluster_public_hostname=openshift-ansible.public.example.com #openshift_master_cluster_public_hostname=openshift-ansible.public.example.com