diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-05-22 14:11:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-22 14:11:31 -0500 |
| commit | 2a575a6240ff624e45628d9848194d1fecb28ff4 (patch) | |
| tree | e491451531ebeb76d5fcf1916abcdca0fc56951a /roles/openshift_logging_elasticsearch | |
| parent | 7426996929fe298f4da0b238e38d91fb929b5112 (diff) | |
| parent | 2740dff958cb3c619ca508d83edb3b351f83c31d (diff) | |
| download | openshift-2a575a6240ff624e45628d9848194d1fecb28ff4.tar.gz openshift-2a575a6240ff624e45628d9848194d1fecb28ff4.tar.bz2 openshift-2a575a6240ff624e45628d9848194d1fecb28ff4.tar.xz openshift-2a575a6240ff624e45628d9848194d1fecb28ff4.zip | |
Merge pull request #25 from stevekuznetsov/skuznets/scale-first
Add Kibana readiness probe, stop using `oc scale` for cluster start
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}}" |