Move these tasks over to the playbook instead of in roles includes

playbooks/groups/proxies.yml

@@ -69,6 +69,27 @@
   handlers:
   - include: "{{ handlers }}/restart_services.yml"
 
+  pre_tasks:
+  #
+  # When we have a prerelease we also need to drop the
+  # config files.
+
+  - name: Remove prerelease-to-final-spins
+    file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins.conf state=absent
+    when: env == 'staging'
+
+  - name: Remove prerelease-to-final-labs
+    file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs.conf state=absent
+    when: env == 'staging'
+
+  - name: Remove prerelease-to-final-gfo
+    file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo.conf state=absent
+    when: env == 'staging'
+
+  - name: Remove prerelease-to-final-arm
+    file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-gfo.conf state=absent
+    when: env == 'staging'
+
   roles:
   - httpd/proxy
   - varnish

playbooks/include/proxies-redirects.yml

@@ -268,25 +268,6 @@
     target: https://arm.stg.fedoraproject.org/$1
     when: env == 'staging'
 
-  # When we have a prerelease we also need to drop the
-  # config files.
-  
-  - name: Remove prerelease-to-final-spins
-    path: /etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins.conf state=absent
-    when: env == 'staging'
-
-  - name: Remove prerelease-to-final-labs
-    path: /etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs.conf state=absent
-    when: env == 'staging'
-
-  - name: Remove prerelease-to-final-gfo
-    path: /etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo.conf state=absent
-    when: env == 'staging'
-
-  - name: Remove prerelease-to-final-arm
-    path: /etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-gfo.conf state=absent
-    when: env == 'staging'
-
   # end staging
 
   - role: httpd/redirectmatch