diff options
| author | Steve Kuznetsov <skuznets@redhat.com> | 2017-05-22 09:42:19 -0700 |
|---|---|---|
| committer | Steve Kuznetsov <skuznets@redhat.com> | 2017-05-22 10:07:59 -0700 |
| commit | 108a42cbbdbfc8094d1d8bf8d0d8826adfdf760d (patch) | |
| tree | 1d7a646d9237aaafeb35c6e1356e996fd3e0417c /roles/openshift_logging_elasticsearch | |
| parent | 7426996929fe298f4da0b238e38d91fb929b5112 (diff) | |
| download | openshift-108a42cbbdbfc8094d1d8bf8d0d8826adfdf760d.tar.gz openshift-108a42cbbdbfc8094d1d8bf8d0d8826adfdf760d.tar.bz2 openshift-108a42cbbdbfc8094d1d8bf8d0d8826adfdf760d.tar.xz openshift-108a42cbbdbfc8094d1d8bf8d0d8826adfdf760d.zip | |
Create logging deployments with non-zero replica counts
When we currently create the set of logging `DeploymentConfig`s, we
create them with zero desired replicas. This causes the deployment to
immediately succeed as there is no work to be done. This inhibits our
ability to use nice CLI UX features like `oc rollout status` to monitor
the logging stack deployments. Instead, we should can create the configs
with the correct number of replicas in the first place and stop using
`oc scale` to bring them up after the fact.
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Diffstat (limited to 'roles/openshift_logging_elasticsearch')
| -rw-r--r-- | roles/openshift_logging_elasticsearch/tasks/main.yaml | 9 | ||||
| -rw-r--r-- | roles/openshift_logging_elasticsearch/templates/es.j2 | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/roles/openshift_logging_elasticsearch/tasks/main.yaml b/roles/openshift_logging_elasticsearch/tasks/main.yaml index 1c1e33c92..8310b1b9b 100644 --- a/roles/openshift_logging_elasticsearch/tasks/main.yaml +++ b/roles/openshift_logging_elasticsearch/tasks/main.yaml @@ -256,6 +256,7 @@ es_memory_limit: "{{ openshift_logging_elasticsearch_memory_limit }}" es_node_selector: "{{ openshift_logging_elasticsearch_nodeselector | default({}) }}" deploy_type: "{{ openshift_logging_elasticsearch_deployment_type }}" + replicas: 1 - name: Set ES dc oc_obj: @@ -267,14 +268,6 @@ - "{{ tempdir }}/templates/logging-es-dc.yml" delete_after: true -# scale up -- name: Start Elasticsearch - oc_scale: - kind: dc - name: "{{ es_deploy_name }}" - namespace: "{{ openshift_logging_elasticsearch_namespace }}" - replicas: 1 - ## Placeholder for migration when necessary ## - name: Delete temp directory diff --git a/roles/openshift_logging_elasticsearch/templates/es.j2 b/roles/openshift_logging_elasticsearch/templates/es.j2 index d2db8432e..e129205ca 100644 --- a/roles/openshift_logging_elasticsearch/templates/es.j2 +++ b/roles/openshift_logging_elasticsearch/templates/es.j2 @@ -8,7 +8,7 @@ metadata: deployment: "{{deploy_name}}" logging-infra: "{{logging_component}}" spec: - replicas: {{replicas|default(0)}} + replicas: {{replicas|default(1)}} selector: provider: openshift component: "{{component}}" |