diff options
| author | Jeff Cantrill <jcantrill@users.noreply.github.com> | 2017-02-21 11:17:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-21 11:17:59 -0500 |
| commit | d20b6a940d13f5676a60af53550354c6a9b965d2 (patch) | |
| tree | 025f7664c00867d528993784acca4e8512f29966 | |
| parent | c4bfb12a5c45e94205e9bd63c74a3d5c95f29ae2 (diff) | |
| parent | 239ea414bd45f9e9bdb861c32574196886ac7c2b (diff) | |
| download | openshift-d20b6a940d13f5676a60af53550354c6a9b965d2.tar.gz openshift-d20b6a940d13f5676a60af53550354c6a9b965d2.tar.bz2 openshift-d20b6a940d13f5676a60af53550354c6a9b965d2.tar.xz openshift-d20b6a940d13f5676a60af53550354c6a9b965d2.zip | |
Merge pull request #3431 from jcantrill/bz_1420256_ops_reusing_non_ops_prefix
Bz 1420256 ops reusing non ops prefix
| -rw-r--r-- | roles/openshift_logging/README.md | 4 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/install_elasticsearch.yaml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/roles/openshift_logging/README.md b/roles/openshift_logging/README.md index f7b2f7743..9189bc2f0 100644 --- a/roles/openshift_logging/README.md +++ b/roles/openshift_logging/README.md @@ -63,7 +63,7 @@ When both `openshift_logging_install_logging` and `openshift_logging_upgrade_log - `openshift_logging_es_cluster_size`: The number of ES cluster members. Defaults to '1'. - `openshift_logging_es_cpu_limit`: The amount of CPU limit for the ES cluster. Unused if not set -- `openshift_logging_es_memory_limit`: The amount of RAM that should be assigned to ES. Defaults to '1024Mi'. +- `openshift_logging_es_memory_limit`: The amount of RAM that should be assigned to ES. Defaults to '8Gi'. - `openshift_logging_es_pv_selector`: A key/value map added to a PVC in order to select specific PVs. Defaults to 'None'. - `openshift_logging_es_pvc_dynamic`: Whether or not to add the dynamic PVC annotation for any generated PVCs. Defaults to 'False'. - `openshift_logging_es_pvc_size`: The requested size for the ES PVCs, when not provided the role will not generate any PVCs. Defaults to '""'. @@ -81,7 +81,7 @@ same as above for their non-ops counterparts, but apply to the OPS cluster insta - `openshift_logging_es_ops_client_key`: /etc/fluent/keys/key - `openshift_logging_es_ops_cluster_size`: 1 - `openshift_logging_es_ops_cpu_limit`: The amount of CPU limit for the ES cluster. Unused if not set -- `openshift_logging_es_ops_memory_limit`: 1024Mi +- `openshift_logging_es_ops_memory_limit`: 8Gi - `openshift_logging_es_ops_pvc_dynamic`: False - `openshift_logging_es_ops_pvc_size`: "" - `openshift_logging_es_ops_pvc_prefix`: logging-es-ops diff --git a/roles/openshift_logging/tasks/install_elasticsearch.yaml b/roles/openshift_logging/tasks/install_elasticsearch.yaml index f9c2c81fb..244949505 100644 --- a/roles/openshift_logging/tasks/install_elasticsearch.yaml +++ b/roles/openshift_logging/tasks/install_elasticsearch.yaml @@ -5,6 +5,7 @@ - name: Generate PersistentVolumeClaims include: "{{ role_path}}/tasks/generate_pvcs.yaml" vars: + es_pvc_pool: [] es_pvc_names: "{{openshift_logging_facts.elasticsearch.pvcs.keys()}}" es_dc_names: "{{openshift_logging_facts.elasticsearch.deploymentconfigs.keys()}}" @@ -63,6 +64,7 @@ - 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}}" |