summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Wolinetz <ewolinet@redhat.com>2017-05-22 14:11:31 -0500
committerGitHub <noreply@github.com>2017-05-22 14:11:31 -0500
commit2a575a6240ff624e45628d9848194d1fecb28ff4 (patch)
treee491451531ebeb76d5fcf1916abcdca0fc56951a
parent7426996929fe298f4da0b238e38d91fb929b5112 (diff)
parent2740dff958cb3c619ca508d83edb3b351f83c31d (diff)
downloadopenshift-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
-rw-r--r--roles/openshift_logging_curator/tasks/main.yaml11
-rw-r--r--roles/openshift_logging_curator/templates/curator.j22
-rw-r--r--roles/openshift_logging_elasticsearch/tasks/main.yaml9
-rw-r--r--roles/openshift_logging_elasticsearch/templates/es.j22
-rw-r--r--roles/openshift_logging_kibana/tasks/main.yaml10
-rw-r--r--roles/openshift_logging_kibana/templates/kibana.j29
-rw-r--r--roles/openshift_logging_mux/tasks/main.yaml10
-rw-r--r--roles/openshift_logging_mux/templates/mux.j22
8 files changed, 15 insertions, 40 deletions
diff --git a/roles/openshift_logging_curator/tasks/main.yaml b/roles/openshift_logging_curator/tasks/main.yaml
index 1ee380610..ae7e48caa 100644
--- a/roles/openshift_logging_curator/tasks/main.yaml
+++ b/roles/openshift_logging_curator/tasks/main.yaml
@@ -91,7 +91,7 @@
es_port: "{{ openshift_logging_curator_es_port }}"
curator_cpu_limit: "{{ openshift_logging_curator_cpu_limit }}"
curator_memory_limit: "{{ openshift_logging_curator_memory_limit }}"
- replicas: "{{ openshift_logging_curator_replicas | default (0)}}"
+ replicas: "{{ openshift_logging_curator_replicas | default (1) }}"
curator_node_selector: "{{openshift_logging_curator_nodeselector | default({})}}"
check_mode: no
changed_when: no
@@ -106,15 +106,6 @@
- "{{ tempdir }}/templates/curator-dc.yaml"
delete_after: true
-# scale up
-- name: Start Curator
- oc_scale:
- kind: dc
- name: "{{ curator_name }}"
- namespace: "{{ openshift_logging_namespace }}"
- replicas: "{{ openshift_logging_curator_replicas | default (1) }}"
-
-
- name: Delete temp directory
file:
name: "{{ tempdir }}"
diff --git a/roles/openshift_logging_curator/templates/curator.j2 b/roles/openshift_logging_curator/templates/curator.j2
index db991e4a9..f8b84861f 100644
--- a/roles/openshift_logging_curator/templates/curator.j2
+++ b/roles/openshift_logging_curator/templates/curator.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}}"
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}}"
diff --git a/roles/openshift_logging_kibana/tasks/main.yaml b/roles/openshift_logging_kibana/tasks/main.yaml
index 3bc903181..4444413e1 100644
--- a/roles/openshift_logging_kibana/tasks/main.yaml
+++ b/roles/openshift_logging_kibana/tasks/main.yaml
@@ -210,7 +210,7 @@
kibana_memory_limit: "{{ openshift_logging_kibana_memory_limit }}"
kibana_proxy_cpu_limit: "{{ openshift_logging_kibana_proxy_cpu_limit }}"
kibana_proxy_memory_limit: "{{ openshift_logging_kibana_proxy_memory_limit }}"
- replicas: "{{ openshift_logging_kibana_replicas | default (0) }}"
+ replicas: "{{ openshift_logging_kibana_replicas | default (1) }}"
kibana_node_selector: "{{ openshift_logging_kibana_nodeselector | default({}) }}"
- name: Set Kibana DC
@@ -223,14 +223,6 @@
- "{{ tempdir }}/templates/kibana-dc.yaml"
delete_after: true
-# Scale up Kibana -- is this really necessary?
-- name: Start Kibana
- oc_scale:
- kind: dc
- name: "{{ kibana_name }}"
- namespace: "{{ openshift_logging_namespace }}"
- replicas: "{{ openshift_logging_kibana_replicas | default (1) }}"
-
# update master configs?
- name: Delete temp directory
diff --git a/roles/openshift_logging_kibana/templates/kibana.j2 b/roles/openshift_logging_kibana/templates/kibana.j2
index ea506b12b..f8043812b 100644
--- a/roles/openshift_logging_kibana/templates/kibana.j2
+++ b/roles/openshift_logging_kibana/templates/kibana.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 }}"
@@ -63,6 +63,13 @@ spec:
- name: kibana
mountPath: /etc/kibana/keys
readOnly: true
+ readinessProbe:
+ exec:
+ command:
+ - "/usr/share/kibana/probe/readiness.sh"
+ initialDelaySeconds: 5
+ timeoutSeconds: 4
+ periodSeconds: 5
-
name: "kibana-proxy"
image: {{ proxy_image }}
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}}"