diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-10 17:26:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-10 17:26:28 -0500 |
| commit | 312831c4c70fb424ca914a5c798350cc4ec7e4a9 (patch) | |
| tree | bb371cac9106aadf020b7706310e6e60a6288bfe /roles | |
| parent | bda3bf8cbc75d1dd9a1c4add106af3feb0563b24 (diff) | |
| parent | 69afd8e8ff5c278cf3907ef6c7e7e1ced6247447 (diff) | |
| download | openshift-312831c4c70fb424ca914a5c798350cc4ec7e4a9.tar.gz openshift-312831c4c70fb424ca914a5c798350cc4ec7e4a9.tar.bz2 openshift-312831c4c70fb424ca914a5c798350cc4ec7e4a9.tar.xz openshift-312831c4c70fb424ca914a5c798350cc4ec7e4a9.zip | |
Merge pull request #3311 from enoodle/logging_ops_nfs_and_pv_provisioning
Provisioning of nfs share and PV for logging ops
Diffstat (limited to 'roles')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 19 | ||||
| -rw-r--r-- | roles/openshift_storage_nfs/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_storage_nfs/templates/exports.j2 | 1 |
3 files changed, 21 insertions, 0 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 7a0642cce..97b3edd6e 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -2081,6 +2081,25 @@ class OpenShiftFacts(object): create_pvc=False ) ), + loggingops=dict( + storage=dict( + kind=None, + volume=dict( + name='logging-es-ops', + size='10Gi' + ), + nfs=dict( + directory='/exports', + options='*(rw,root_squash)' + ), + host=None, + access=dict( + modes=['ReadWriteOnce'] + ), + create_pv=True, + create_pvc=False + ) + ), logging=dict( storage=dict( kind=None, diff --git a/roles/openshift_storage_nfs/tasks/main.yml b/roles/openshift_storage_nfs/tasks/main.yml index fd935f105..0d6b8b7d4 100644 --- a/roles/openshift_storage_nfs/tasks/main.yml +++ b/roles/openshift_storage_nfs/tasks/main.yml @@ -29,6 +29,7 @@ - "{{ openshift.hosted.registry }}" - "{{ openshift.hosted.metrics }}" - "{{ openshift.hosted.logging }}" + - "{{ openshift.hosted.loggingops }}" - name: Configure exports diff --git a/roles/openshift_storage_nfs/templates/exports.j2 b/roles/openshift_storage_nfs/templates/exports.j2 index 2d6dd85e3..8c6d4105c 100644 --- a/roles/openshift_storage_nfs/templates/exports.j2 +++ b/roles/openshift_storage_nfs/templates/exports.j2 @@ -1,3 +1,4 @@ {{ openshift.hosted.registry.storage.nfs.directory }}/{{ openshift.hosted.registry.storage.volume.name }} {{ openshift.hosted.registry.storage.nfs.options }} {{ 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 }} |