diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-29 12:15:48 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-29 12:15:48 -0800 |
| commit | 2e1f7e52c6847d51200e273c57b667d4b69a54fc (patch) | |
| tree | f8601e29b4c7d34f051a7908fdf8995580ab4802 /playbooks/aws | |
| parent | 3346448363ead62312cb29596dcf3df5ce753ef7 (diff) | |
| parent | c600ea408130cf1877ed92d22ba5763fe7d18cc4 (diff) | |
| download | openshift-2e1f7e52c6847d51200e273c57b667d4b69a54fc.tar.gz openshift-2e1f7e52c6847d51200e273c57b667d4b69a54fc.tar.bz2 openshift-2e1f7e52c6847d51200e273c57b667d4b69a54fc.tar.xz openshift-2e1f7e52c6847d51200e273c57b667d4b69a54fc.zip | |
Merge pull request #6889 from mazzystr/fix-port-alignment
Automatic merge from submit-queue.
Fix misaligned ports for sg,elb,api
Fix to issue [6867](https://github.com/openshift/openshift-ansible/issues/6867)
The scope of this patch widened slightly to consolidate some AWS ELB vars/dicts into the single dictionary due to Health check being sourced by all ELBs. By default health check needs to ping 8443 for master ELBS and 443 for infra ELBs. Consolidating allows for changes to the behavior of one ELB without affecting the others.
@sdodson @kwoodson
Diffstat (limited to 'playbooks/aws')
| -rw-r--r-- | playbooks/aws/provisioning_vars.yml.example | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/playbooks/aws/provisioning_vars.yml.example b/playbooks/aws/provisioning_vars.yml.example index a1a8a5b08..78484fdbd 100644 --- a/playbooks/aws/provisioning_vars.yml.example +++ b/playbooks/aws/provisioning_vars.yml.example @@ -21,6 +21,12 @@ openshift_release: # v3.7 # This will be dependent on the version provided by the yum repository openshift_pkg_version: # -3.7.0 +# OpenShift api port +# Fulfills a chicken/egg scenario with how Ansible treats host inventory file +# and extra_vars. This is used for SecurityGroups, ELB Listeners as well as +# an override to installer inventory openshift_master_api_port key +# openshift_master_api_port: 8443 + # specify a clusterid # This value is also used as the default value for many other components. #openshift_aws_clusterid: default |