diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-03-02 16:40:53 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-02 16:40:53 -0500 |
commit | 4630305622b6f8d6957f93da72b15fe4bda1fd02 (patch) | |
tree | c5498fc481ab4ac3a1e92a907d0523dad58f15ef /roles/openshift_logging/tasks/install_elasticsearch.yaml | |
parent | a101d9e8a2a746faa2fce6f5849d9a01585e0485 (diff) | |
parent | bd7f9386fa2cbe201509486b9ba9ac74b23e8f8a (diff) | |
download | openshift-4630305622b6f8d6957f93da72b15fe4bda1fd02.tar.gz openshift-4630305622b6f8d6957f93da72b15fe4bda1fd02.tar.bz2 openshift-4630305622b6f8d6957f93da72b15fe4bda1fd02.tar.xz openshift-4630305622b6f8d6957f93da72b15fe4bda1fd02.zip |
Merge pull request #3548 from jcantrill/bz_1420256_again_reset_pvc_facts
bug 1420256. Initialize openshift_logging pvc_facts to empty
Diffstat (limited to 'roles/openshift_logging/tasks/install_elasticsearch.yaml')
-rw-r--r-- | roles/openshift_logging/tasks/install_elasticsearch.yaml | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/roles/openshift_logging/tasks/install_elasticsearch.yaml b/roles/openshift_logging/tasks/install_elasticsearch.yaml index 244949505..6b441c4aa 100644 --- a/roles/openshift_logging/tasks/install_elasticsearch.yaml +++ b/roles/openshift_logging/tasks/install_elasticsearch.yaml @@ -5,9 +5,13 @@ - name: Generate PersistentVolumeClaims include: "{{ role_path}}/tasks/generate_pvcs.yaml" vars: - es_pvc_pool: [] + es_pv_selector: "{{openshift_logging_es_pv_selector}}" + es_pvc_dynamic: "{{openshift_logging_es_pvc_dynamic | bool}}" es_pvc_names: "{{openshift_logging_facts.elasticsearch.pvcs.keys()}}" + es_pvc_prefix: "{{openshift_logging_es_pvc_prefix}}" + 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}}" # we should initialize the es_dc_pool with the current keys - name: Init pool of DeploymentConfig names for Elasticsearch @@ -61,17 +65,18 @@ - "{{es_dcs | length - openshift_logging_es_ops_cluster_size|int | abs > 1}}" check_mode: no +- set_fact: es_pvc_pool={{[]}} + - name: Generate PersistentVolumeClaims for Ops include: "{{ role_path}}/tasks/generate_pvcs.yaml" vars: - es_pvc_pool: [] es_pvc_names: "{{openshift_logging_facts.elasticsearch_ops.pvcs.keys()}}" es_dc_names: "{{openshift_logging_facts.elasticsearch_ops.deploymentconfigs.keys()}}" - openshift_logging_es_pvc_prefix: "{{openshift_logging_es_ops_pvc_prefix}}" - openshift_logging_es_cluster_size: "{{openshift_logging_es_ops_cluster_size|int}}" - openshift_logging_es_pvc_size: "{{openshift_logging_es_ops_pvc_size}}" - openshift_logging_es_pvc_dynamic: "{{openshift_logging_es_ops_pvc_dynamic}}" - openshift_logging_es_pv_selector: "{{openshift_logging_es_ops_pv_selector}}" + es_pvc_size: "{{openshift_logging_es_ops_pvc_size}}" + es_pvc_prefix: "{{openshift_logging_es_ops_pvc_prefix}}" + 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}}" when: - openshift_logging_use_ops | bool check_mode: no |