diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-10 08:10:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-10 08:10:41 -0500 |
| commit | 19ae452d558d7f04f49d024bf82fcb7221c8fa0d (patch) | |
| tree | 6a06bfb124ce15bc26cf97da60a8631e2d0b5069 /roles/openshift_logging | |
| parent | aa155550a651708fcb200746ad78fb0bbf562e94 (diff) | |
| parent | 4b06eaf83e137ddeba2ce498e141ad87413761c0 (diff) | |
| download | openshift-19ae452d558d7f04f49d024bf82fcb7221c8fa0d.tar.gz openshift-19ae452d558d7f04f49d024bf82fcb7221c8fa0d.tar.bz2 openshift-19ae452d558d7f04f49d024bf82fcb7221c8fa0d.tar.xz openshift-19ae452d558d7f04f49d024bf82fcb7221c8fa0d.zip | |
Merge pull request #6674 from mgugino-upstream-stage/remove-becomes2
Remove become statements
Diffstat (limited to 'roles/openshift_logging')
| -rw-r--r-- | roles/openshift_logging/tasks/generate_jks.yaml | 6 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/main.yaml | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/roles/openshift_logging/tasks/generate_jks.yaml b/roles/openshift_logging/tasks/generate_jks.yaml index d6ac88dcc..6e3204589 100644 --- a/roles/openshift_logging/tasks/generate_jks.yaml +++ b/roles/openshift_logging/tasks/generate_jks.yaml @@ -24,25 +24,21 @@ 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 - become: no - name: Create placeholder for previously created JKS certs to prevent recreating... 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 - become: no - name: Create placeholder for previously created JKS certs to prevent recreating... 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 - become: no - name: Create placeholder for previously created JKS certs to prevent recreating... 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 - become: no - name: pulling down signing items from host fetch: @@ -61,12 +57,10 @@ 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 - become: no - name: Run JKS generation script local_action: script generate-jks.sh {{local_tmp.stdout}} {{openshift_logging_namespace}} check_mode: no - become: no 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... diff --git a/roles/openshift_logging/tasks/main.yaml b/roles/openshift_logging/tasks/main.yaml index 9949bb95d..60cc399fa 100644 --- a/roles/openshift_logging/tasks/main.yaml +++ b/roles/openshift_logging/tasks/main.yaml @@ -17,7 +17,11 @@ register: local_tmp changed_when: False check_mode: no - become: no + +- name: Chmod local temp directory for doing work in + local_action: command chmod 777 "{{ local_tmp.stdout }}" + changed_when: False + check_mode: no - include_tasks: install_logging.yaml when: @@ -31,4 +35,3 @@ local_action: file path="{{local_tmp.stdout}}" state=absent tags: logging_cleanup changed_when: False - become: no |