diff options
| author | ewolinetz <ewolinet@redhat.com> | 2017-03-03 17:26:44 -0600 |
|---|---|---|
| committer | ewolinetz <ewolinet@redhat.com> | 2017-03-03 17:26:44 -0600 |
| commit | 7c72a665d9391a1597fe192fa88d6d0a50058185 (patch) | |
| tree | 9af7706da24c2cfeaa77d1ed47c2fbdebb15e356 /roles/openshift_logging/tasks | |
| parent | 15601e4b3bbd4aebc4dfd3e6736854af35820150 (diff) | |
| download | openshift-7c72a665d9391a1597fe192fa88d6d0a50058185.tar.gz openshift-7c72a665d9391a1597fe192fa88d6d0a50058185.tar.bz2 openshift-7c72a665d9391a1597fe192fa88d6d0a50058185.tar.xz openshift-7c72a665d9391a1597fe192fa88d6d0a50058185.zip | |
Adding some more logging defaults
Diffstat (limited to 'roles/openshift_logging/tasks')
| -rw-r--r-- | roles/openshift_logging/tasks/generate_pvcs.yaml | 4 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/install_elasticsearch.yaml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/roles/openshift_logging/tasks/generate_pvcs.yaml b/roles/openshift_logging/tasks/generate_pvcs.yaml index d6d1abd06..20c7277e3 100644 --- a/roles/openshift_logging/tasks/generate_pvcs.yaml +++ b/roles/openshift_logging/tasks/generate_pvcs.yaml @@ -16,7 +16,7 @@ obj_name: "{{claim_name}}" size: "{{es_pvc_size}}" access_modes: - - ReadWriteOnce + - "{{ es_access_modes }}" pv_selector: "{{es_pv_selector}}" with_items: - "{{es_pvc_pool | default([])}}" @@ -36,7 +36,7 @@ volume.alpha.kubernetes.io/storage-class: "dynamic" size: "{{es_pvc_size}}" access_modes: - - ReadWriteOnce + - "{{ es_access_modes }}" pv_selector: "{{es_pv_selector}}" with_items: - "{{es_pvc_pool|default([])}}" diff --git a/roles/openshift_logging/tasks/install_elasticsearch.yaml b/roles/openshift_logging/tasks/install_elasticsearch.yaml index 6b441c4aa..2941ecbfe 100644 --- a/roles/openshift_logging/tasks/install_elasticsearch.yaml +++ b/roles/openshift_logging/tasks/install_elasticsearch.yaml @@ -12,6 +12,7 @@ es_pvc_size: "{{openshift_logging_es_pvc_size}}" es_dc_names: "{{openshift_logging_facts.elasticsearch.deploymentconfigs.keys()}}" es_cluster_size: "{{openshift_logging_es_cluster_size}}" + es_access_modes: "{{ openshift_logging_storage_access_modes }}" # we should initialize the es_dc_pool with the current keys - name: Init pool of DeploymentConfig names for Elasticsearch @@ -77,6 +78,7 @@ es_cluster_size: "{{openshift_logging_es_ops_cluster_size|int}}" es_pvc_dynamic: "{{openshift_logging_es_ops_pvc_dynamic | bool}}" es_pv_selector: "{{openshift_logging_es_ops_pv_selector}}" + es_access_modes: "{{ openshift_logging_storage_access_modes }}" when: - openshift_logging_use_ops | bool check_mode: no |