summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master_certificates
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-06-27 17:14:45 -0400
committerGitHub <noreply@github.com>2017-06-27 17:14:45 -0400
commit77d8b348f09fe078e425b76079cc716520198b21 (patch)
treefdb90ef4e48344ea6ed210f52b480a62b7ab2b80 /roles/openshift_master_certificates
parent688ff95bda5cbd58976744c58593a9c3cdec8fe5 (diff)
parent0090224d431a9a6553e13e6d8b959de0866607e7 (diff)
downloadopenshift-77d8b348f09fe078e425b76079cc716520198b21.tar.gz
openshift-77d8b348f09fe078e425b76079cc716520198b21.tar.bz2
openshift-77d8b348f09fe078e425b76079cc716520198b21.tar.xz
openshift-77d8b348f09fe078e425b76079cc716520198b21.zip
Merge pull request #4605 from abutcher/loopback-named-ca
Generate loopback kubeconfig separately to preserve OpenShift CA certificate.
Diffstat (limited to 'roles/openshift_master_certificates')
-rw-r--r--roles/openshift_master_certificates/tasks/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master_certificates/tasks/main.yml b/roles/openshift_master_certificates/tasks/main.yml
index 62413536b..d9ffb1b6f 100644
--- a/roles/openshift_master_certificates/tasks/main.yml
+++ b/roles/openshift_master_certificates/tasks/main.yml
@@ -74,10 +74,10 @@
- name: Generate the loopback master client config
command: >
{{ hostvars[openshift_ca_host].openshift.common.client_binary }} adm create-api-client-config
+ --certificate-authority={{ openshift_ca_cert }}
{% for named_ca_certificate in openshift.master.named_certificates | default([]) | oo_collect('cafile') %}
--certificate-authority {{ named_ca_certificate }}
{% endfor %}
- --certificate-authority={{ openshift_ca_cert }}
--client-dir={{ openshift_generated_configs_dir }}/master-{{ hostvars[item].openshift.common.hostname }}
--groups=system:masters,system:openshift-master
--master={{ hostvars[item].openshift.master.loopback_api_url }}