Browse Source

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.
OpenShift Merge Robot 7 years ago
parent
commit
1a58f7fc76
1 changed files with 3 additions and 1 deletions
  1. 3 1
      roles/openshift_aws/defaults/main.yml

+ 3 - 1
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: