summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
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_master
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_master')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 7aa4ce9b6..500690523 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -46,7 +46,7 @@ etcdConfig:
certFile: etcd.server.crt
clientCA: ca.crt
keyFile: etcd.server.key
- storageDirectory: {{ openshift_data_dir }}/openshift.local.etcd
+ storageDirectory: {{ openshift.common.data_dir }}/openshift.local.etcd
{% endif %}
etcdStorageConfig:
kubernetesStoragePrefix: kubernetes.io