diff options
author | Russell Teague <rteague@redhat.com> | 2017-02-09 09:50:27 -0500 |
---|---|---|
committer | Russell Teague <rteague@redhat.com> | 2017-02-14 09:25:45 -0500 |
commit | 1e0ec746a7521c5167975daf293e0b96395c8a56 (patch) | |
tree | 7381c96cba1dbd2dd7a750dfc64b72e277eb0389 /roles/openshift_logging/tasks/stop_cluster.yaml | |
parent | 7127518224d996e01a89db147434e404ebd35296 (diff) | |
download | openshift-1e0ec746a7521c5167975daf293e0b96395c8a56.tar.gz openshift-1e0ec746a7521c5167975daf293e0b96395c8a56.tar.bz2 openshift-1e0ec746a7521c5167975daf293e0b96395c8a56.tar.xz openshift-1e0ec746a7521c5167975daf293e0b96395c8a56.zip |
Modify playbooks to use oc_label module
Diffstat (limited to 'roles/openshift_logging/tasks/stop_cluster.yaml')
-rw-r--r-- | roles/openshift_logging/tasks/stop_cluster.yaml | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/roles/openshift_logging/tasks/stop_cluster.yaml b/roles/openshift_logging/tasks/stop_cluster.yaml index 7826efabe..0244424d0 100644 --- a/roles/openshift_logging/tasks/stop_cluster.yaml +++ b/roles/openshift_logging/tasks/stop_cluster.yaml @@ -9,11 +9,11 @@ when: "'--all' in openshift_logging_fluentd_hosts" - name: stop fluentd - include: label_node.yaml - vars: - host: "{{fluentd_host}}" - label: "{{openshift_logging_fluentd_nodeselector.keys()[0]}}" - unlabel: True + oc_label: + name: "{{ fluentd_host }}" + kind: node + state: absent + label: "{{ openshift_logging_fluentd_nodeselector | oo_dict_to_list_of_dict }}" with_items: "{{ openshift_logging_fluentd_hosts }}" loop_control: loop_var: fluentd_host @@ -28,7 +28,6 @@ kind: dc name: "{{object.split('/')[1]}}" namespace: "{{openshift_logging_namespace}}" - kubeconfig: "{{mktemp.stdout}}/admin.kubeconfig" replicas: 0 with_items: "{{es_dc.stdout_lines}}" loop_control: @@ -44,7 +43,6 @@ kind: dc name: "{{object.split('/')[1]}}" namespace: "{{openshift_logging_namespace}}" - kubeconfig: "{{mktemp.stdout}}/admin.kubeconfig" replicas: 0 with_items: "{{kibana_dc.stdout_lines}}" loop_control: @@ -60,7 +58,6 @@ kind: dc name: "{{object.split('/')[1]}}" namespace: "{{openshift_logging_namespace}}" - kubeconfig: "{{mktemp.stdout}}/admin.kubeconfig" replicas: 0 with_items: "{{curator_dc.stdout_lines}}" loop_control: @@ -76,7 +73,6 @@ kind: dc name: "{{object.split('/')[1]}}" namespace: "{{openshift_logging_namespace}}" - kubeconfig: "{{mktemp.stdout}}/admin.kubeconfig" replicas: 0 with_items: "{{es_dc.stdout_lines}}" loop_control: @@ -93,7 +89,6 @@ kind: dc name: "{{object.split('/')[1]}}" namespace: "{{openshift_logging_namespace}}" - kubeconfig: "{{mktemp.stdout}}/admin.kubeconfig" replicas: 0 with_items: "{{kibana_dc.stdout_lines}}" loop_control: @@ -110,7 +105,6 @@ kind: dc name: "{{object.split('/')[1]}}" namespace: "{{openshift_logging_namespace}}" - kubeconfig: "{{mktemp.stdout}}/admin.kubeconfig" replicas: 0 with_items: "{{curator_dc.stdout_lines}}" loop_control: |