diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-12-20 12:23:45 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-20 12:23:45 -0800 |
commit | 898b43c24a0db0f53cd272de0f3dec2a32bbc34e (patch) | |
tree | 99cb6240e59a7118b2b4c9be603efc7eaeaf4679 /roles/openshift_node_certificates | |
parent | a5de165b8e7113631a30ef0e4a20b5f74db073f0 (diff) | |
parent | e6c159afb4ba39a7266c750d43d6a5e911cc8f21 (diff) | |
download | openshift-898b43c24a0db0f53cd272de0f3dec2a32bbc34e.tar.gz openshift-898b43c24a0db0f53cd272de0f3dec2a32bbc34e.tar.bz2 openshift-898b43c24a0db0f53cd272de0f3dec2a32bbc34e.tar.xz openshift-898b43c24a0db0f53cd272de0f3dec2a32bbc34e.zip |
Merge pull request #6516 from mgugino-upstream-stage/defact-is-containerized
Automatic merge from submit-queue.
Remove openshift.common.{is_atomic|is_containerized}
We set these variables using facts in init, no need
to duplicate the logic all around the codebase.
Diffstat (limited to 'roles/openshift_node_certificates')
-rw-r--r-- | roles/openshift_node_certificates/tasks/main.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_node_certificates/tasks/main.yml b/roles/openshift_node_certificates/tasks/main.yml index 1e5ebe98e..e95e38fdf 100644 --- a/roles/openshift_node_certificates/tasks/main.yml +++ b/roles/openshift_node_certificates/tasks/main.yml @@ -51,7 +51,7 @@ - name: Generate the node client config command: > - {{ hostvars[openshift_ca_host].openshift.common.client_binary }} adm create-api-client-config + {{ hostvars[openshift_ca_host]['first_master_client_binary'] }} adm create-api-client-config {% for named_ca_certificate in hostvars[openshift_ca_host].openshift.master.named_certificates | default([]) | lib_utils_oo_collect('cafile') %} --certificate-authority {{ named_ca_certificate }} {% endfor %} @@ -77,7 +77,7 @@ - name: Generate the node server certificate command: > - {{ hostvars[openshift_ca_host].openshift.common.client_binary }} adm ca create-server-cert + {{ hostvars[openshift_ca_host]['first_master_client_binary'] }} adm ca create-server-cert --cert={{ openshift_generated_configs_dir }}/node-{{ hostvars[item].openshift.common.hostname }}/server.crt --key={{ openshift_generated_configs_dir }}/node-{{ hostvars[item].openshift.common.hostname }}/server.key --expire-days={{ openshift_node_cert_expire_days }} |