diff options
| author | ewolinetz <ewolinet@redhat.com> | 2017-03-07 18:18:45 -0600 |
|---|---|---|
| committer | ewolinetz <ewolinet@redhat.com> | 2017-03-07 18:18:45 -0600 |
| commit | ab88af6414729556cabf4bde7cbb4ea83b183e3f (patch) | |
| tree | c3c204ad8b95085c2385cca552997bf7f316ce0e /roles/openshift_logging/tasks | |
| parent | e10f7af55a3c311870eb65ac1ec4dd6c511ab5c0 (diff) | |
| download | openshift-ab88af6414729556cabf4bde7cbb4ea83b183e3f.tar.gz openshift-ab88af6414729556cabf4bde7cbb4ea83b183e3f.tar.bz2 openshift-ab88af6414729556cabf4bde7cbb4ea83b183e3f.tar.xz openshift-ab88af6414729556cabf4bde7cbb4ea83b183e3f.zip | |
More logging fixes
Diffstat (limited to 'roles/openshift_logging/tasks')
| -rw-r--r-- | roles/openshift_logging/tasks/generate_pvcs.yaml | 2 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/install_elasticsearch.yaml | 4 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/install_logging.yaml | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/roles/openshift_logging/tasks/generate_pvcs.yaml b/roles/openshift_logging/tasks/generate_pvcs.yaml index 20c7277e3..e1629908f 100644 --- a/roles/openshift_logging/tasks/generate_pvcs.yaml +++ b/roles/openshift_logging/tasks/generate_pvcs.yaml @@ -6,8 +6,8 @@ start: "{{es_pvc_names | map('regex_search', es_pvc_prefix+'.*')|select('string')|list|length}}" with_sequence: start={{start}} end={{ (start|int > es_cluster_size|int - 1) | ternary(start, es_cluster_size|int - 1)}} when: + - "{{ es_dc_names|default([]) | length <= es_cluster_size|int }}" - es_pvc_size | search('^\d.*') - - "{{ es_dc_names|default([]) | length < es_cluster_size|int }}" check_mode: no - name: Generating PersistentVolumeClaims diff --git a/roles/openshift_logging/tasks/install_elasticsearch.yaml b/roles/openshift_logging/tasks/install_elasticsearch.yaml index e908e802c..a0ad12d94 100644 --- a/roles/openshift_logging/tasks/install_elasticsearch.yaml +++ b/roles/openshift_logging/tasks/install_elasticsearch.yaml @@ -32,10 +32,6 @@ with_sequence: count={{ openshift_logging_es_cluster_size | int - openshift_logging_current_es_size | int }} check_mode: no -- set_fact: nodeselector="{{openshift_logging_es_nodeselector | default({}) }}" - -- debug: var=nodeselector - - name: Generate Elasticsearch DeploymentConfig template: src=es.j2 dest={{mktemp.stdout}}/templates/logging-{{deploy_name}}-dc.yaml vars: diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml index 59ba05da3..1beff3bfc 100644 --- a/roles/openshift_logging/tasks/install_logging.yaml +++ b/roles/openshift_logging/tasks/install_logging.yaml @@ -78,7 +78,7 @@ loop_var: sa_account when: - openshift_logging_image_pull_secret is defined - - openshift_logging_image_pull_secret is not None + - openshift_logging_image_pull_secret != '' failed_when: link_pull_secret.rc != 0 - name: Scaling up cluster |