summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/templates
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-09-10 15:56:15 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2015-09-10 15:56:15 -0400
commita5011b9ad04c552a5fcda77d08cdb5fa77d40f01 (patch)
tree3e2fceb65a5061512f0313dda029474f2c2878bb /roles/openshift_master/templates
parent40c6cccf492c787421b4438392804fe188fbc58b (diff)
parent12b56e720a8221208fbc1c5dd8a7e5732aa4f04e (diff)
downloadopenshift-a5011b9ad04c552a5fcda77d08cdb5fa77d40f01.tar.gz
openshift-a5011b9ad04c552a5fcda77d08cdb5fa77d40f01.tar.bz2
openshift-a5011b9ad04c552a5fcda77d08cdb5fa77d40f01.tar.xz
openshift-a5011b9ad04c552a5fcda77d08cdb5fa77d40f01.zip
Merge pull request #570 from sdodson/openshift_data_dir
Move openshift_data_dir to openshift.common.data_dir fact based on deployment_type
Diffstat (limited to 'roles/openshift_master/templates')
-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