summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/tasks
diff options
context:
space:
mode:
authorewolinetz <ewolinet@redhat.com>2017-01-20 14:19:09 -0600
committerewolinetz <ewolinet@redhat.com>2017-01-20 14:19:09 -0600
commit9edfa73d2caeca19472bb369580d10a1c9057c24 (patch)
tree79afabddb1a990e4e6a3df531b6d874e8bf474a4 /roles/openshift_logging/tasks
parent7cb710f66261ee6367c0b9ee88bced87f1331134 (diff)
downloadopenshift-9edfa73d2caeca19472bb369580d10a1c9057c24.tar.gz
openshift-9edfa73d2caeca19472bb369580d10a1c9057c24.tar.bz2
openshift-9edfa73d2caeca19472bb369580d10a1c9057c24.tar.xz
openshift-9edfa73d2caeca19472bb369580d10a1c9057c24.zip
Removing docker run strategy and make java a requirement for control host
Diffstat (limited to 'roles/openshift_logging/tasks')
-rw-r--r--roles/openshift_logging/tasks/generate_certs.yaml16
1 files changed, 4 insertions, 12 deletions
diff --git a/roles/openshift_logging/tasks/generate_certs.yaml b/roles/openshift_logging/tasks/generate_certs.yaml
index b3826838a..3940ff971 100644
--- a/roles/openshift_logging/tasks/generate_certs.yaml
+++ b/roles/openshift_logging/tasks/generate_certs.yaml
@@ -112,20 +112,12 @@
register: truststore_jks
check_mode: no
-- name: create JKS generation container
- command: >
- docker run
- -u 0
- -e "PROJECT={{openshift_logging_namespace}}"
- -e "CERT_DIR={{generated_certs_dir}}"
- -v "{{generated_certs_dir}}:{{generated_certs_dir}}"
- --name "jks_gen_{{'abcdefghijklmnopqrstuvwxyz0123456789'|random_word(10)}}"
- --entrypoint="/bin/bash"
- "{{openshift_logging_image_prefix}}logging-deployer:{{openshift_logging_image_version}}"
- "{{generated_certs_dir}}/generate-jks.sh"
- register: container_output
+- name: Run JKS generation script
+ script: generate-jks.sh {{generate_certs_dir}} {{openshift_logging_namespace}}
+ register: script_output
check_mode: no
become: yes
+ changed_when: script_output.RC == "0"
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
# check for secret/logging-kibana-proxy