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_mux | |
| 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_mux')
| -rw-r--r-- | roles/openshift_logging_mux/tasks/main.yaml | 10 | ||||
| -rw-r--r-- | roles/openshift_logging_mux/templates/mux.j2 | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/roles/openshift_logging_mux/tasks/main.yaml b/roles/openshift_logging_mux/tasks/main.yaml index 907bb0098..e64a4d275 100644 --- a/roles/openshift_logging_mux/tasks/main.yaml +++ b/roles/openshift_logging_mux/tasks/main.yaml @@ -172,7 +172,7 @@ ops_port: "{{ openshift_logging_mux_ops_port }}" mux_cpu_limit: "{{ openshift_logging_mux_cpu_limit }}" mux_memory_limit: "{{ openshift_logging_mux_memory_limit }}" - replicas: "{{ openshift_logging_mux_replicas | default(0) }}" + replicas: "{{ openshift_logging_mux_replicas | default(1) }}" mux_node_selector: "{{ openshift_logging_mux_nodeselector | default({}) }}" check_mode: no changed_when: no @@ -187,14 +187,6 @@ - "{{ tempdir }}/templates/logging-mux-dc.yaml" delete_after: true -# Scale up Mux -- name: Start Mux - oc_scale: - kind: dc - name: "logging-mux" - namespace: "{{ openshift_logging_mux_namespace }}" - replicas: "{{ openshift_logging_mux_replicas | default (1) }}" - - name: Delete temp directory file: name: "{{ tempdir }}" diff --git a/roles/openshift_logging_mux/templates/mux.j2 b/roles/openshift_logging_mux/templates/mux.j2 index 84b8ff53d..770a2bfbd 100644 --- a/roles/openshift_logging_mux/templates/mux.j2 +++ b/roles/openshift_logging_mux/templates/mux.j2 @@ -7,7 +7,7 @@ metadata: component: "{{component}}" logging-infra: "{{logging_component}}" spec: - replicas: {{replicas|default(0)}} + replicas: {{replicas|default(1)}} selector: provider: openshift component: "{{component}}" |