diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2018-01-08 10:49:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-08 10:49:28 -0500 |
| commit | 5608019c7c70755d4839e6e0eef3ca5ab4f04277 (patch) | |
| tree | 833c55e47fe4fff251e756117436ef020fddf6b1 /roles | |
| parent | 594e275ea1a2202558b399e6e0f9ad40b496fd01 (diff) | |
| parent | ad9a8899258439ee86418aac367cb5a89647a739 (diff) | |
| download | openshift-5608019c7c70755d4839e6e0eef3ca5ab4f04277.tar.gz openshift-5608019c7c70755d4839e6e0eef3ca5ab4f04277.tar.bz2 openshift-5608019c7c70755d4839e6e0eef3ca5ab4f04277.tar.xz openshift-5608019c7c70755d4839e6e0eef3ca5ab4f04277.zip | |
Merge pull request #6641 from sdodson/logging-loops
Switch back to dynamic include_role in logging loops
Diffstat (limited to 'roles')
| -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" |