Merge "Remove old service cleanups from zuul"

playbooks/roles/nodepool-builder/tasks/main.yaml

@@ -42,14 +42,3 @@
 - name: Run docker prune to cleanup unneeded images
   shell:
     cmd: docker image prune -f
-
-- name: Disable old service
-  service:
-    name: nodepool-builder
-    enabled: no
-  failed_when: false
-
-- name: Remove old init scripts
-  file:
-    state: absent
-    path: /etc/init.d/nodepool-builder

playbooks/roles/nodepool-launcher/tasks/main.yaml

@@ -59,14 +59,3 @@
 - name: Run docker prune to cleanup unneeded images
   shell:
     cmd: docker image prune -f
-
-- name: Disable old service
-  service:
-    name: nodepool-launcher
-    enabled: no
-  failed_when: false
-
-- name: Remove old init scripts
-  file:
-    state: absent
-    path: /etc/init.d/nodepool-launcher

playbooks/roles/zuul-executor/tasks/main.yaml

@@ -92,17 +92,3 @@
 - name: Run docker prune to cleanup unneeded images
   shell:
     cmd: docker image prune -f
-
-- name: Disable old service
-  service:
-    name: zuul-executor
-    enabled: no
-  failed_when: false
-
-- name: Remove old init script files
-  file:
-    state: absent
-    path: '{{ item }}'
-  loop:
-    - /etc/default/zuul-executor
-    - /etc/init.d/zuul-executor

playbooks/roles/zuul-merger/tasks/main.yaml

@@ -56,14 +56,3 @@
 - name: Run docker prune to cleanup unneeded images
   shell:
     cmd: docker image prune -f
-
-- name: Disable old service
-  service:
-    name: zuul-merger
-    enabled: no
-  failed_when: false
-
-- name: Remove old init scripts
-  file:
-    state: absent
-    path: /etc/init.d/zuul-merger

playbooks/roles/zuul-scheduler/tasks/main.yaml

@@ -77,14 +77,3 @@
 - name: Run docker prune to cleanup unneeded images
   shell:
     cmd: docker image prune -f
-
-- name: Disable old service
-  service:
-    name: zuul-scheduler
-    enabled: no
-  failed_when: false
-
-- name: Remove old init scripts
-  file:
-    state: absent
-    path: /etc/init.d/zuul-scheduler

playbooks/roles/zuul-web/tasks/main.yaml

@@ -20,16 +20,6 @@
     - cache_socache
     - headers
 
-- name: Remove old apache config
-  file:
-    state: absent
-    path: '{{ item }}'
-  loop:
-    - 40-zuul.opendev.org.conf
-    - 40-zuul.opendev.org-http.conf
-    - 50-zuul.openstack.org.conf
-    - 50-zuul.openstack.org-http.conf
-
 - name: Copy common log configuration
   copy:
     src: log-combined-cache.conf
@@ -124,20 +114,3 @@
 - name: Run docker prune to cleanup unneeded images
   shell:
     cmd: docker image prune -f
-
-- name: Disable old service
-  service:
-    name: 'zuul-{{ item }}'
-    enabled: no
-  failed_when: false
-  loop:
-    - web
-    - fingergw
-
-- name: Remove old init scripts
-  file:
-    state: absent
-    path: '/etc/init.d/zuul-{{ item }}'
-  loop:
-    - web
-    - fingergw