From 765fb5ce39fdca0b56a23f6d13650fe16debf20a Mon Sep 17 00:00:00 2001 From: Jeff Cantrill Date: Thu, 15 Dec 2016 15:48:09 -0500 Subject: update vars to allow scaling of components (#9) --- roles/openshift_metrics/tasks/start_metrics.yaml | 52 ++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 roles/openshift_metrics/tasks/start_metrics.yaml (limited to 'roles/openshift_metrics/tasks/start_metrics.yaml') diff --git a/roles/openshift_metrics/tasks/start_metrics.yaml b/roles/openshift_metrics/tasks/start_metrics.yaml new file mode 100644 index 000000000..99d593dd7 --- /dev/null +++ b/roles/openshift_metrics/tasks/start_metrics.yaml @@ -0,0 +1,52 @@ +--- +- shell: > + {{openshift.common.client_binary}} + --config={{mktemp.stdout}}/admin.kubeconfig + get rc + -l metrics-infra=hawkular-cassandra + -o name + -n {{openshift_metrics_project}} + register: metrics_cassandra_rc + +- name: Start Hawkular Cassandra + include: scale.yaml + vars: + desired: 1 + with_items: "{{metrics_cassandra_rc.stdout_lines}}" + loop_control: + loop_var: object + +- shell: > + {{openshift.common.client_binary}} + --config={{mktemp.stdout}}/admin.kubeconfig + get rc + -l metrics-infra=hawkular-metrics + -o name + -n {{openshift_metrics_project}} + register: metrics_metrics_rc + +- name: Start Hawkular Metrics + include: scale.yaml + vars: + desired: "{{openshift_metrics_hawkular_replicas}}" + with_items: "{{metrics_metrics_rc.stdout_lines}}" + loop_control: + loop_var: object + +- shell: > + {{openshift.common.client_binary}} + --config={{mktemp.stdout}}/admin.kubeconfig + get rc + -l metrics-infra=heapster + -o name + -n {{openshift_metrics_project}} + register: metrics_heapster_rc + check_mode: no + +- name: Start Heapster + include: scale.yaml + vars: + desired: 1 + with_items: "{{metrics_heapster_rc.stdout_lines}}" + loop_control: + loop_var: object -- cgit v1.2.3 From a5f6e3f684a3294056d4d4e224226b90acc062e6 Mon Sep 17 00:00:00 2001 From: Jeff Cantrill Date: Wed, 11 Jan 2017 14:07:19 -0500 Subject: additional code reviews --- roles/openshift_metrics/tasks/start_metrics.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'roles/openshift_metrics/tasks/start_metrics.yaml') diff --git a/roles/openshift_metrics/tasks/start_metrics.yaml b/roles/openshift_metrics/tasks/start_metrics.yaml index 99d593dd7..0906d71a2 100644 --- a/roles/openshift_metrics/tasks/start_metrics.yaml +++ b/roles/openshift_metrics/tasks/start_metrics.yaml @@ -1,5 +1,5 @@ --- -- shell: > +- command: > {{openshift.common.client_binary}} --config={{mktemp.stdout}}/admin.kubeconfig get rc @@ -7,6 +7,7 @@ -o name -n {{openshift_metrics_project}} register: metrics_cassandra_rc + changed_when: no - name: Start Hawkular Cassandra include: scale.yaml @@ -16,7 +17,7 @@ loop_control: loop_var: object -- shell: > +- command: > {{openshift.common.client_binary}} --config={{mktemp.stdout}}/admin.kubeconfig get rc @@ -24,6 +25,7 @@ -o name -n {{openshift_metrics_project}} register: metrics_metrics_rc + changed_when: no - name: Start Hawkular Metrics include: scale.yaml @@ -33,7 +35,7 @@ loop_control: loop_var: object -- shell: > +- command: > {{openshift.common.client_binary}} --config={{mktemp.stdout}}/admin.kubeconfig get rc -- cgit v1.2.3 From 9c6766e8588ff96bffc0479251dbbb5dd9c80521 Mon Sep 17 00:00:00 2001 From: Jeff Cantrill Date: Thu, 12 Jan 2017 08:38:06 -0500 Subject: metrics fixes for yamlint --- roles/openshift_metrics/tasks/start_metrics.yaml | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'roles/openshift_metrics/tasks/start_metrics.yaml') diff --git a/roles/openshift_metrics/tasks/start_metrics.yaml b/roles/openshift_metrics/tasks/start_metrics.yaml index 0906d71a2..31f303c86 100644 --- a/roles/openshift_metrics/tasks/start_metrics.yaml +++ b/roles/openshift_metrics/tasks/start_metrics.yaml @@ -1,10 +1,10 @@ --- - command: > - {{openshift.common.client_binary}} - --config={{mktemp.stdout}}/admin.kubeconfig - get rc - -l metrics-infra=hawkular-cassandra - -o name + {{openshift.common.client_binary}} + --config={{mktemp.stdout}}/admin.kubeconfig + get rc + -l metrics-infra=hawkular-cassandra + -o name -n {{openshift_metrics_project}} register: metrics_cassandra_rc changed_when: no @@ -18,11 +18,11 @@ loop_var: object - command: > - {{openshift.common.client_binary}} - --config={{mktemp.stdout}}/admin.kubeconfig - get rc - -l metrics-infra=hawkular-metrics - -o name + {{openshift.common.client_binary}} + --config={{mktemp.stdout}}/admin.kubeconfig + get rc + -l metrics-infra=hawkular-metrics + -o name -n {{openshift_metrics_project}} register: metrics_metrics_rc changed_when: no @@ -36,11 +36,11 @@ loop_var: object - command: > - {{openshift.common.client_binary}} - --config={{mktemp.stdout}}/admin.kubeconfig - get rc + {{openshift.common.client_binary}} + --config={{mktemp.stdout}}/admin.kubeconfig + get rc -l metrics-infra=heapster - -o name + -o name -n {{openshift_metrics_project}} register: metrics_heapster_rc check_mode: no -- cgit v1.2.3 From e96de3d7eb0b0ce6a8df96d4e3afa02f0859b94b Mon Sep 17 00:00:00 2001 From: Jeff Cantrill Date: Fri, 13 Jan 2017 12:19:55 -0500 Subject: properly set changes when oc apply --- roles/openshift_metrics/tasks/start_metrics.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roles/openshift_metrics/tasks/start_metrics.yaml') diff --git a/roles/openshift_metrics/tasks/start_metrics.yaml b/roles/openshift_metrics/tasks/start_metrics.yaml index 31f303c86..c4cae4aff 100644 --- a/roles/openshift_metrics/tasks/start_metrics.yaml +++ b/roles/openshift_metrics/tasks/start_metrics.yaml @@ -43,7 +43,7 @@ -o name -n {{openshift_metrics_project}} register: metrics_heapster_rc - check_mode: no + changed_when: no - name: Start Heapster include: scale.yaml -- cgit v1.2.3