summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-20 13:34:38 -0400
committerGitHub <noreply@github.com>2017-07-20 13:34:38 -0400
commit4f5aa38fc9bb2836d9409ad0e6ece87ae9da774a (patch)
treec52d4769c3f43483a6359f97aca46cc934979537
parent90ca98433ec4224e40d7551ab49b04faecc28df0 (diff)
parented274e2d034da6e2dff8d88c0cedb2a89f20ccb9 (diff)
downloadopenshift-4f5aa38fc9bb2836d9409ad0e6ece87ae9da774a.tar.gz
openshift-4f5aa38fc9bb2836d9409ad0e6ece87ae9da774a.tar.bz2
openshift-4f5aa38fc9bb2836d9409ad0e6ece87ae9da774a.tar.xz
openshift-4f5aa38fc9bb2836d9409ad0e6ece87ae9da774a.zip
Merge pull request #4798 from abutcher/hosted-etcd-pv
Add etcd exports to openshift_storage_nfs
-rw-r--r--roles/openshift_storage_nfs/tasks/main.yml2
-rw-r--r--roles/openshift_storage_nfs/templates/exports.j21
2 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_storage_nfs/tasks/main.yml b/roles/openshift_storage_nfs/tasks/main.yml
index 0d6b8b7d4..019ada2fb 100644
--- a/roles/openshift_storage_nfs/tasks/main.yml
+++ b/roles/openshift_storage_nfs/tasks/main.yml
@@ -30,7 +30,7 @@
- "{{ openshift.hosted.metrics }}"
- "{{ openshift.hosted.logging }}"
- "{{ openshift.hosted.loggingops }}"
-
+ - "{{ openshift.hosted.etcd }}"
- name: Configure exports
template:
diff --git a/roles/openshift_storage_nfs/templates/exports.j2 b/roles/openshift_storage_nfs/templates/exports.j2
index 8c6d4105c..7e8f70b23 100644
--- a/roles/openshift_storage_nfs/templates/exports.j2
+++ b/roles/openshift_storage_nfs/templates/exports.j2
@@ -2,3 +2,4 @@
{{ openshift.hosted.metrics.storage.nfs.directory }}/{{ openshift.hosted.metrics.storage.volume.name }} {{ openshift.hosted.metrics.storage.nfs.options }}
{{ openshift.hosted.logging.storage.nfs.directory }}/{{ openshift.hosted.logging.storage.volume.name }} {{ openshift.hosted.logging.storage.nfs.options }}
{{ openshift.hosted.loggingops.storage.nfs.directory }}/{{ openshift.hosted.loggingops.storage.volume.name }} {{ openshift.hosted.loggingops.storage.nfs.options }}
+{{ openshift.hosted.etcd.storage.nfs.directory }}/{{ openshift.hosted.etcd.storage.volume.name }} {{ openshift.hosted.etcd.storage.nfs.options }}