Merge "Gate: simplify playbooks"

playbooks/osh-infra-collect-logs.yaml

@@ -31,38 +31,11 @@
     logs_dir: "/tmp/logs"
   roles:
     - helm-release-status
+    - describe-kubernetes-objects
+    - gather-pod-logs
+    - gather-prom-metrics
   tags:
     - helm-release-status
-
-- hosts: primary
-  vars_files:
-    - vars.yaml
-  vars:
-    work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
-    logs_dir: "/tmp/logs"
-  roles:
     - describe-kubernetes-objects
-  tags:
-    - describe-kubernetes-objects
-
-- hosts: primary
-  vars_files:
-    - vars.yaml
-  vars:
-    work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
-    logs_dir: "/tmp/logs"
-  roles:
     - gather-pod-logs
-  tags:
-    - gather-pod-logs
-
-- hosts: primary
-  vars_files:
-    - vars.yaml
-  vars:
-    work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
-    logs_dir: "/tmp/logs"
-  roles:
-    - gather-prom-metrics
-  tags:
-    - gather-prom-metrics
+    - gather-prom-metrics

playbooks/osh-infra-deploy-k8s.yaml

@@ -20,18 +20,10 @@
   gather_facts: True
   roles:
     - build-helm-packages
-  tags:
-    - build-helm-packages
-
-- hosts: primary
-  vars_files:
-    - vars.yaml
-  vars:
-    work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
-  roles:
     - deploy-kubeadm-aio-master
   tags:
-    - deploy-kube-master
+    - build-helm-packages
+    - deploy-kubeadm-aio-master
 
 - hosts: nodes
   vars_files:
@@ -41,4 +33,4 @@
   roles:
     - deploy-kubeadm-aio-node
   tags:
-    - deploy-kube-nodes
+    - deploy-kubeadm-aio-node