diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-05 21:17:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 21:17:25 -0800 |
| commit | 18c555e595551c3b5b54159616c5b9ece2d0983b (patch) | |
| tree | ee2d65c5235476a40db81181a78a18afdc13e4e6 /roles/openshift_node_certificates | |
| parent | 0c5f70ad87e25f26a074613ad4576d5bcd759054 (diff) | |
| parent | 7923eb92c86a128504436ba0708c96b655de5269 (diff) | |
| download | openshift-18c555e595551c3b5b54159616c5b9ece2d0983b.tar.gz openshift-18c555e595551c3b5b54159616c5b9ece2d0983b.tar.bz2 openshift-18c555e595551c3b5b54159616c5b9ece2d0983b.tar.xz openshift-18c555e595551c3b5b54159616c5b9ece2d0983b.zip | |
Merge pull request #6597 from mgugino-upstream-stage/etc-remove-become-no
Automatic merge from submit-queue.
Remove become=no from etcd cert tasks
etcd runs some actions locally to copy certs from the
CA cert host.
We shouldn't hard-code become behavior as it can be
unexpected for the end user.
Diffstat (limited to 'roles/openshift_node_certificates')
| -rw-r--r-- | roles/openshift_node_certificates/tasks/main.yml | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/roles/openshift_node_certificates/tasks/main.yml b/roles/openshift_node_certificates/tasks/main.yml index e95e38fdf..5f73f3bdc 100644 --- a/roles/openshift_node_certificates/tasks/main.yml +++ b/roles/openshift_node_certificates/tasks/main.yml @@ -94,13 +94,6 @@ delegate_to: "{{ openshift_ca_host }}" run_once: true -- name: Create local temp directory for syncing certs - local_action: command mktemp -d /tmp/openshift-ansible-XXXXXXX - register: node_cert_mktemp - changed_when: False - when: node_certs_missing | bool - become: no - - name: Create a tarball of the node config directories command: > tar -czvf {{ openshift_node_generated_config_dir }}.tgz @@ -117,8 +110,7 @@ - name: Retrieve the node config tarballs from the master fetch: src: "{{ openshift_node_generated_config_dir }}.tgz" - dest: "{{ node_cert_mktemp.stdout }}/" - flat: yes + dest: "/tmp" fail_on_missing: yes validate_checksum: yes when: node_certs_missing | bool @@ -132,15 +124,14 @@ - name: Unarchive the tarball on the node unarchive: - src: "{{ node_cert_mktemp.stdout }}/{{ openshift_node_cert_subdir }}.tgz" + src: "/tmp/{{ inventory_hostname }}/{{ openshift_node_generated_config_dir }}.tgz" dest: "{{ openshift_node_cert_dir }}" when: node_certs_missing | bool - name: Delete local temp directory - local_action: file path="{{ node_cert_mktemp.stdout }}" state=absent + local_action: file path="/tmp/{{ inventory_hostname }}" state=absent changed_when: False when: node_certs_missing | bool - become: no - name: Copy OpenShift CA to system CA trust copy: |