summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/templates
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2015-09-09 12:03:09 -0400
committerScott Dodson <sdodson@redhat.com>2015-09-10 09:22:33 -0400
commit12b56e720a8221208fbc1c5dd8a7e5732aa4f04e (patch)
treef8e5921035094af05d4235c39022a85a9c88aa85 /roles/openshift_node/templates
parent5ea59791dd5fd30664f076a3a768c34a99ff6af8 (diff)
downloadopenshift-12b56e720a8221208fbc1c5dd8a7e5732aa4f04e.tar.gz
openshift-12b56e720a8221208fbc1c5dd8a7e5732aa4f04e.tar.bz2
openshift-12b56e720a8221208fbc1c5dd8a7e5732aa4f04e.tar.xz
openshift-12b56e720a8221208fbc1c5dd8a7e5732aa4f04e.zip
Move openshift_data_dir to a fact based on deployment_type
Previously this was being set to /var/lib/origin regardless of deployment_type which isn't correct given that existing 'enterprise' and 'online' deployments would have been deployed with /var/lib/openshift
Diffstat (limited to 'roles/openshift_node/templates')
-rw-r--r--roles/openshift_node/templates/node.yaml.v1.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2
index 0f708fb55..07d80f99b 100644
--- a/roles/openshift_node/templates/node.yaml.v1.j2
+++ b/roles/openshift_node/templates/node.yaml.v1.j2
@@ -25,5 +25,5 @@ servingInfo:
certFile: server.crt
clientCA: ca.crt
keyFile: server.key
-volumeDirectory: {{ openshift_data_dir }}/openshift.local.volumes
+volumeDirectory: {{ openshift.common.data_dir }}/openshift.local.volumes
{% include 'partials/kubeletArguments.j2' %}