diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-07 19:35:29 -0500 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2018-01-07 19:35:29 -0500 |
| commit | ad9a8899258439ee86418aac367cb5a89647a739 (patch) | |
| tree | 44531eea68eb07a3dd22dc33e02921622a6b425d | |
| parent | 79d910dc899083e7d74d69195ea7232b5bc4b22e (diff) | |
| download | openshift-ad9a8899258439ee86418aac367cb5a89647a739.tar.gz openshift-ad9a8899258439ee86418aac367cb5a89647a739.tar.bz2 openshift-ad9a8899258439ee86418aac367cb5a89647a739.tar.xz openshift-ad9a8899258439ee86418aac367cb5a89647a739.zip | |
Switch back to dynamic include_role in logging loops
We'd switched to import_role to avoid increased memory consumption but
we must use include_role whenever we loop.
| -rw-r--r-- | roles/openshift_logging/tasks/install_logging.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml index 185f47f50..67904a9d3 100644 --- a/roles/openshift_logging/tasks/install_logging.yaml +++ b/roles/openshift_logging/tasks/install_logging.yaml @@ -75,7 +75,7 @@ elasticsearch_storage_type: "{{ openshift_logging_elasticsearch_storage_type | default('pvc' if ( openshift_logging_es_pvc_dynamic | bool or openshift_hosted_logging_storage_kind | default('') == 'nfs' or openshift_logging_es_pvc_size | length > 0) else 'emptydir') }}" # We don't allow scaling down of ES nodes currently -- import_role: +- include_role: name: openshift_logging_elasticsearch vars: generated_certs_dir: "{{openshift.common.config_base}}/logging" @@ -103,7 +103,7 @@ - openshift_logging_facts.elasticsearch.deploymentconfigs.keys() | count > 0 # Create any new DC that may be required -- import_role: +- include_role: name: openshift_logging_elasticsearch vars: generated_certs_dir: "{{openshift.common.config_base}}/logging" @@ -137,7 +137,7 @@ when: - openshift_logging_use_ops | bool -- import_role: +- include_role: name: openshift_logging_elasticsearch vars: generated_certs_dir: "{{openshift.common.config_base}}/logging" @@ -180,7 +180,7 @@ - openshift_logging_facts.elasticsearch_ops.deploymentconfigs.keys() | count > 0 # Create any new DC that may be required -- import_role: +- include_role: name: openshift_logging_elasticsearch vars: generated_certs_dir: "{{openshift.common.config_base}}/logging" |