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 /roles/openshift_aws/tasks | |
| 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 'roles/openshift_aws/tasks')
| -rw-r--r-- | roles/openshift_aws/tasks/elb.yml | 12 | ||||
| -rw-r--r-- | roles/openshift_aws/tasks/master_facts.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_aws/tasks/provision_elb.yml | 1 |
3 files changed, 7 insertions, 8 deletions
diff --git a/roles/openshift_aws/tasks/elb.yml b/roles/openshift_aws/tasks/elb.yml index 6f0028a3d..d8257cf31 100644 --- a/roles/openshift_aws/tasks/elb.yml +++ b/roles/openshift_aws/tasks/elb.yml @@ -5,18 +5,18 @@ - name: "Create ELB {{ l_elb_dict_item.key }}" ec2_elb_lb: - name: "{{ l_openshift_aws_elb_name_dict[l_elb_dict_item.key][item.key] }}" + name: "{{ item.value.name }}" state: present - cross_az_load_balancing: "{{ openshift_aws_elb_az_load_balancing }}" + cross_az_load_balancing: "{{ item.value.cross_az_load_balancing }}" security_group_names: "{{ l_elb_security_groups[l_elb_dict_item.key] }}" - idle_timeout: "{{ openshift_aws_elb_idle_timout }}" + idle_timeout: "{{ item.value.idle_timout }}" region: "{{ openshift_aws_region }}" subnets: - "{{ subnetout.subnets[0].id }}" - health_check: "{{ openshift_aws_elb_health_check }}" - listeners: "{{ item.value }}" + health_check: "{{ item.value.health_check }}" + listeners: "{{ item.value.listeners }}" scheme: "{{ (item.key == 'internal') | ternary('internal','internet-facing') }}" - tags: "{{ openshift_aws_elb_tags }}" + tags: "{{ item.value.tags }}" wait: True register: new_elb with_dict: "{{ l_elb_dict_item.value }}" diff --git a/roles/openshift_aws/tasks/master_facts.yml b/roles/openshift_aws/tasks/master_facts.yml index 530b0134d..c2e362acd 100644 --- a/roles/openshift_aws/tasks/master_facts.yml +++ b/roles/openshift_aws/tasks/master_facts.yml @@ -3,7 +3,7 @@ ec2_elb_facts: region: "{{ openshift_aws_region }}" names: - - "{{ openshift_aws_elb_name_dict['master']['internal'] }}" + - "{{ openshift_aws_elb_dict['master']['internal']['name'] }}" delegate_to: localhost register: elbs diff --git a/roles/openshift_aws/tasks/provision_elb.yml b/roles/openshift_aws/tasks/provision_elb.yml index a52f63bd5..fcc49c3ea 100644 --- a/roles/openshift_aws/tasks/provision_elb.yml +++ b/roles/openshift_aws/tasks/provision_elb.yml @@ -10,6 +10,5 @@ with_dict: "{{ openshift_aws_elb_dict }}" vars: l_elb_security_groups: "{{ openshift_aws_elb_security_groups }}" - l_openshift_aws_elb_name_dict: "{{ openshift_aws_elb_name_dict }}" loop_control: loop_var: l_elb_dict_item |