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 | |
| 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')
4 files changed, 4 insertions, 8 deletions
diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml index ced3bcdb3..ad9c1ce42 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -6,7 +6,7 @@ openshift_logging_master_url: "https://kubernetes.default.svc.{{ openshift.commo openshift_logging_master_public_url: "{{ openshift_hosted_logging_master_public_url | default('https://' + openshift.common.public_hostname + ':' + openshift.master.api_port) }}" openshift_logging_namespace: logging openshift_logging_install_logging: True -openshift_logging_image_pull_secret: "{{ openshift_hosted_logging_image_pull_secret | default(None) }}" +openshift_logging_image_pull_secret: "{{ openshift_hosted_logging_image_pull_secret | default('') }}" openshift_logging_curator_default_days: 30 openshift_logging_curator_run_hour: 0 @@ -99,7 +99,7 @@ openshift_logging_es_ops_storage_group: "{{ openshift_hosted_logging_elasticsear openshift_logging_es_ops_nodeselector: "{{ openshift_hosted_logging_elasticsearch_ops_nodeselector | default('') | map_from_pairs }}" # storage related defaults -openshift_logging_storage_access_modes: "{{ openshift_hosted_logging_storage_access_modes | default(['ReadWriteOnce']) }}" +openshift_logging_storage_access_modes: "{{ openshift_hosted_logging_storage_access_modes | default('ReadWriteOnce') }}" # following can be uncommented to provide values for configmaps -- take care when providing file contents as it may cause your cluster to not operate correctly 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 |