diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-31 21:38:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-31 21:38:03 -0800 |
| commit | 1a58f7fc7622e3e96dab0b45737203ae89af8e76 (patch) | |
| tree | a360c4ab9c28de5e367a37519c1e2b7f7c9b6baa | |
| parent | 68886cca9aeea0a49145cb24652daa76012cc35d (diff) | |
| parent | bf0a2001225f6a019dabed710da13f44bbe4c0e3 (diff) | |
| download | openshift-1a58f7fc7622e3e96dab0b45737203ae89af8e76.tar.gz openshift-1a58f7fc7622e3e96dab0b45737203ae89af8e76.tar.bz2 openshift-1a58f7fc7622e3e96dab0b45737203ae89af8e76.tar.xz openshift-1a58f7fc7622e3e96dab0b45737203ae89af8e76.zip | |
Merge pull request #6947 from abutcher/openshift_aws_elb_cert_arn
Automatic merge from submit-queue.
Re-add openshift_aws_elb_cert_arn.
This got removed in https://github.com/openshift/openshift-ansible/pull/6889 which breaks functionality for us.
| -rw-r--r-- | roles/openshift_aws/defaults/main.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_aws/defaults/main.yml b/roles/openshift_aws/defaults/main.yml index 178e0849c..c8d385db5 100644 --- a/roles/openshift_aws/defaults/main.yml +++ b/roles/openshift_aws/defaults/main.yml @@ -44,6 +44,8 @@ openshift_aws_s3_bucket_name: "{{ openshift_aws_clusterid }}-docker-registry" openshift_aws_elb_basename: "{{ openshift_aws_clusterid }}" +openshift_aws_elb_cert_arn: '' + openshift_aws_elb_dict: master: external: @@ -65,7 +67,7 @@ openshift_aws_elb_dict: load_balancer_port: "{{ openshift_master_api_port | default(8443) }}" instance_protocol: ssl instance_port: "{{ openshift_master_api_port | default(8443) }}" - ssl_certificate_id: '' + ssl_certificate_id: "{{ openshift_aws_elb_cert_arn }}" name: "{{ openshift_aws_elb_basename }}-master-external" tags: "{{ openshift_aws_kube_tags }}" internal: |