diff options
author | Jason DeTiberus <detiber@gmail.com> | 2017-01-24 23:21:12 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-24 23:21:12 -0500 |
commit | b09163ff0e87e457ca9f8cdc9cb42c6c8e241fbb (patch) | |
tree | cd710aad71049a8403402c2ca36747683936c3f9 /roles/openshift_logging/tasks/generate_jks.yaml | |
parent | a181ed47b39e2a26057ccfb5e5c37a6bf14c1e6c (diff) | |
parent | a5da69ef2e5c21aa82a3c780e6d0fa88df6085dd (diff) | |
download | openshift-b09163ff0e87e457ca9f8cdc9cb42c6c8e241fbb.tar.gz openshift-b09163ff0e87e457ca9f8cdc9cb42c6c8e241fbb.tar.bz2 openshift-b09163ff0e87e457ca9f8cdc9cb42c6c8e241fbb.tar.xz openshift-b09163ff0e87e457ca9f8cdc9cb42c6c8e241fbb.zip |
Merge pull request #3171 from ewolinetz/logging_local_file_creation
fixes jks generation, node labeling, and rerunning for oauth secrets
Diffstat (limited to 'roles/openshift_logging/tasks/generate_jks.yaml')
-rw-r--r-- | roles/openshift_logging/tasks/generate_jks.yaml | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/roles/openshift_logging/tasks/generate_jks.yaml b/roles/openshift_logging/tasks/generate_jks.yaml index adb6c2b2d..c6e2ccbc0 100644 --- a/roles/openshift_logging/tasks/generate_jks.yaml +++ b/roles/openshift_logging/tasks/generate_jks.yaml @@ -27,34 +27,22 @@ check_mode: no - name: Create placeholder for previously created JKS certs to prevent recreating... - file: - path: "{{local_tmp.stdout}}/elasticsearch.jks" - state: touch - mode: "u=rw,g=r,o=r" + local_action: file path="{{local_tmp.stdout}}/elasticsearch.jks" state=touch mode="u=rw,g=r,o=r" when: elasticsearch_jks.stat.exists changed_when: False - name: Create placeholder for previously created JKS certs to prevent recreating... - file: - path: "{{local_tmp.stdout}}/logging-es.jks" - state: touch - mode: "u=rw,g=r,o=r" + local_action: file path="{{local_tmp.stdout}}/logging-es.jks" state=touch mode="u=rw,g=r,o=r" when: logging_es_jks.stat.exists changed_when: False - name: Create placeholder for previously created JKS certs to prevent recreating... - file: - path: "{{local_tmp.stdout}}/system.admin.jks" - state: touch - mode: "u=rw,g=r,o=r" + local_action: file path="{{local_tmp.stdout}}/system.admin.jks" state=touch mode="u=rw,g=r,o=r" when: system_admin_jks.stat.exists changed_when: False - name: Create placeholder for previously created JKS certs to prevent recreating... - file: - path: "{{local_tmp.stdout}}/truststore.jks" - state: touch - mode: "u=rw,g=r,o=r" + local_action: file path="{{local_tmp.stdout}}/truststore.jks" state=touch mode="u=rw,g=r,o=r" when: truststore_jks.stat.exists changed_when: False @@ -69,15 +57,16 @@ - ca.serial.txt - ca.crl.srl - ca.db + when: not elasticsearch_jks.stat.exists or not logging_es_jks.stat.exists or not system_admin_jks.stat.exists or not truststore_jks.stat.exists - local_action: template src=signing.conf.j2 dest={{local_tmp.stdout}}/signing.conf vars: - top_dir: "{{local_tmp.stdout}}" + when: not elasticsearch_jks.stat.exists or not logging_es_jks.stat.exists or not system_admin_jks.stat.exists or not truststore_jks.stat.exists - name: Run JKS generation script local_action: script generate-jks.sh {{local_tmp.stdout}} {{openshift_logging_namespace}} check_mode: no - become: yes when: not elasticsearch_jks.stat.exists or not logging_es_jks.stat.exists or not system_admin_jks.stat.exists or not truststore_jks.stat.exists - name: Pushing locally generated JKS certs to remote host... @@ -105,7 +94,5 @@ when: not truststore_jks.stat.exists - name: Cleaning up temp dir - file: - path: "{{local_tmp.stdout}}" - state: absent + local_action: file path="{{local_tmp.stdout}}" state=absent changed_when: False |