diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-06-15 13:19:59 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-08-01 11:33:14 -0400 |
| commit | 4c66a9b62488b5e344f2e65cda6bc2ba3e0f2933 (patch) | |
| tree | 57f0d2ee98a622e012d339c044e84d5855718949 /roles/openshift_master_certificates | |
| parent | 1bdbe5ed4b609d06651d4d3ded4dc70a7f7ed865 (diff) | |
| download | openshift-4c66a9b62488b5e344f2e65cda6bc2ba3e0f2933.tar.gz openshift-4c66a9b62488b5e344f2e65cda6bc2ba3e0f2933.tar.bz2 openshift-4c66a9b62488b5e344f2e65cda6bc2ba3e0f2933.tar.xz openshift-4c66a9b62488b5e344f2e65cda6bc2ba3e0f2933.zip | |
Add options for specifying named ca certificates to be added to the openshift ca bundle.
Diffstat (limited to 'roles/openshift_master_certificates')
| -rw-r--r-- | roles/openshift_master_certificates/meta/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_master_certificates/tasks/main.yml | 13 |
2 files changed, 9 insertions, 5 deletions
diff --git a/roles/openshift_master_certificates/meta/main.yml b/roles/openshift_master_certificates/meta/main.yml index dd19c8ded..018186e86 100644 --- a/roles/openshift_master_certificates/meta/main.yml +++ b/roles/openshift_master_certificates/meta/main.yml @@ -13,4 +13,5 @@ galaxy_info: - cloud - system dependencies: +- role: openshift_master_facts - role: openshift_ca diff --git a/roles/openshift_master_certificates/tasks/main.yml b/roles/openshift_master_certificates/tasks/main.yml index 6fb5830cf..9ed082d9f 100644 --- a/roles/openshift_master_certificates/tasks/main.yml +++ b/roles/openshift_master_certificates/tasks/main.yml @@ -49,11 +49,14 @@ - name: Create the master certificates if they do not already exist command: > {{ openshift.common.admin_binary }} create-master-certs - --hostnames={{ openshift.common.all_hostnames | join(',') }} - --master={{ openshift.master.api_url }} - --public-master={{ openshift.master.public_api_url }} - --cert-dir={{ openshift_master_generated_config_dir }} - --overwrite=false + {% for named_ca_certificate in openshift.master.named_certificates | default([]) | oo_collect('cafile') %} + --certificate-authority {{ named_ca_certificate }} + {% endfor %} + --hostnames={{ openshift.common.all_hostnames | join(',') }} + --master={{ openshift.master.api_url }} + --public-master={{ openshift.master.public_api_url }} + --cert-dir={{ openshift_master_generated_config_dir }} + --overwrite=false when: master_certs_missing | bool delegate_to: "{{ openshift_ca_host }}" |