Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-3.10] Update openshift ca redeploy to use correct node client-ca #10048

Merged
merged 1 commit into from
Sep 13, 2018
Merged

[release-3.10] Update openshift ca redeploy to use correct node client-ca #10048

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions playbooks/openshift-master/private/redeploy-openshift-ca.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,21 +234,21 @@
tasks:
- copy:
src: "{{ hostvars['localhost'].g_master_mktemp.stdout }}/ca-bundle.crt"
dest: "{{ openshift.common.config_base }}/node/ca.crt"
dest: "{{ openshift.common.config_base }}/node/client-ca.crt"
- name: Copy OpenShift CA to system CA trust
copy:
src: "{{ item.cert }}"
dest: "/etc/pki/ca-trust/source/anchors/{{ item.id }}-{{ item.cert | basename }}"
remote_src: yes
with_items:
- id: openshift
cert: "{{ openshift.common.config_base }}/node/ca.crt"
cert: "{{ openshift.common.config_base }}/node/client-ca.crt"
notify:
- update ca trust
- name: Update node client kubeconfig CA data
kubeclient_ca:
client_path: "{{ openshift.common.config_base }}/node/system:node:{{ openshift.common.hostname }}.kubeconfig"
ca_path: "{{ openshift.common.config_base }}/node/ca.crt"
ca_path: "{{ openshift.common.config_base }}/node/client-ca.crt"
handlers:
# Normally this handler would restart docker after updating ca
# trust. We'll do that when we restart nodes to avoid restarting
Expand Down Expand Up @@ -284,7 +284,7 @@
- ('expired' not in hostvars
| lib_utils_oo_select_keys(groups['oo_nodes_to_config'])
| lib_utils_oo_collect('check_results.check_results.ocp_certs')
| lib_utils_oo_collect('health', {'path':hostvars[groups.oo_nodes_to_config.0].openshift.common.config_base ~ "/node/ca.crt"}))
| lib_utils_oo_collect('health', {'path':hostvars[groups.oo_nodes_to_config.0].openshift.common.config_base ~ "/node/client-ca.crt"}))
# masters
- ('expired' not in hostvars
| lib_utils_oo_select_keys(groups['oo_masters_to_config'])
Expand Down