summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/templates
diff options
context:
space:
mode:
authorewolinetz <ewolinet@redhat.com>2016-12-14 16:34:55 -0600
committerewolinetz <ewolinet@redhat.com>2016-12-15 16:25:10 -0600
commitf79c819387b93af7b32a09b60652195f850d0574 (patch)
treefdfdadc875d46c64b1ca4e28d2b0286b32daaee4 /roles/openshift_logging/templates
parentb579a4acfa64f85119ffbcbb8f6701972ef0dbb6 (diff)
downloadopenshift-f79c819387b93af7b32a09b60652195f850d0574.tar.gz
openshift-f79c819387b93af7b32a09b60652195f850d0574.tar.bz2
openshift-f79c819387b93af7b32a09b60652195f850d0574.tar.xz
openshift-f79c819387b93af7b32a09b60652195f850d0574.zip
Updating to use deployer pod to generate JKS chain instead
Diffstat (limited to 'roles/openshift_logging/templates')
-rw-r--r--roles/openshift_logging/templates/jks_pod.j2 (renamed from roles/openshift_logging/templates/job.j2)8
1 files changed, 5 insertions, 3 deletions
diff --git a/roles/openshift_logging/templates/job.j2 b/roles/openshift_logging/templates/jks_pod.j2
index d7794a407..8b1c74211 100644
--- a/roles/openshift_logging/templates/job.j2
+++ b/roles/openshift_logging/templates/jks_pod.j2
@@ -9,17 +9,19 @@ spec:
- name: jks-cert-gen
image: {{openshift_logging_image_prefix}}logging-deployer:{{openshift_logging_image_version}}
imagePullPolicy: Always
- command: ["sh", "generate-jks.sh"]
+ command: ["sh", "{{generated_certs_dir}}/generate-jks.sh"]
securityContext:
privileged: true
volumeMounts:
- - mountPath: /opt/deploy
+ - mountPath: {{generated_certs_dir}}
name: certmount
env:
- name: PROJECT
value: {{openshift_logging_namespace}}
+ - name: CERT_DIR
+ value: {{generated_certs_dir}}
restartPolicy: Never
- serviceAccount: aggregated-logging-fluentd
+ serviceAccount: jks-generator
volumes:
- hostPath:
path: "{{generated_certs_dir}}"