Remove duplicate role, since mod_wsgi pull apache now

30 files changed, 0 insertions, 30 deletions

diff --git a/playbooks/groups/ask.yml b/playbooks/groups/ask.yml
index 574e309dc..ddb946838 100644
--- a/playbooks/groups/ask.yml
+++ b/playbooks/groups/ask.yml
@@ -17,7 +17,6 @@
   - hosts
   - fas_client
   - collectd/base
-  - apache
   - mod_wsgi
   - ask
   - fedmsg/base
diff --git a/playbooks/groups/autocloud-web.yml b/playbooks/groups/autocloud-web.yml
index 47ec534ce..018ec2235 100644
--- a/playbooks/groups/autocloud-web.yml
+++ b/playbooks/groups/autocloud-web.yml
@@ -20,7 +20,6 @@
   - hosts
   - fas_client
   - collectd/base
-  - apache
   - mod_wsgi
   - fedmsg/base
   - sudo
diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml
index 3f53cd99b..2bf307d52 100644
--- a/playbooks/groups/badges-web.yml
+++ b/playbooks/groups/badges-web.yml
@@ -22,7 +22,6 @@
   - hosts
   - fas_client
   - collectd/base
-  - apache
   - badges/frontend
   - fedmsg/base
   - rsyncd
diff --git a/playbooks/groups/basset.yml b/playbooks/groups/basset.yml
index 3ee7b82e9..baa9991dc 100644
--- a/playbooks/groups/basset.yml
+++ b/playbooks/groups/basset.yml
@@ -25,7 +25,6 @@
       when: env != "staging" }
   - mongodb
   - rabbitmq
-  - apache
   - mod_wsgi
   - basset/frontend
   - basset/worker
diff --git a/playbooks/groups/blockerbugs.yml b/playbooks/groups/blockerbugs.yml
index 113eda688..9a39f538e 100644
--- a/playbooks/groups/blockerbugs.yml
+++ b/playbooks/groups/blockerbugs.yml
@@ -22,7 +22,6 @@
   - rsyncd
   - { role: openvpn/client,
       when: env != "staging" }
-  - apache
   - mod_wsgi
   - blockerbugs
 
diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml
index c6eeaa106..8e7e5666d 100644
--- a/playbooks/groups/datagrepper.yml
+++ b/playbooks/groups/datagrepper.yml
@@ -24,7 +24,6 @@
   - sudo
   - { role: openvpn/client,
       when: env != "staging" }
-  - apache
   - mod_wsgi
 
   tasks:
diff --git a/playbooks/groups/elections.yml b/playbooks/groups/elections.yml
index afdc6a262..2d9eb68e8 100644
--- a/playbooks/groups/elections.yml
+++ b/playbooks/groups/elections.yml
@@ -20,7 +20,6 @@
   - sudo
   - { role: openvpn/client,
       when: env != "staging" }
-  - apache
   - mod_wsgi
   - collectd/base
 
diff --git a/playbooks/groups/fas.yml b/playbooks/groups/fas.yml
index 3243a22ac..0fad0c07f 100644
--- a/playbooks/groups/fas.yml
+++ b/playbooks/groups/fas.yml
@@ -21,7 +21,6 @@
   - collectd/base
   - rsyncd
   - memcached
-  - apache
   - mod_wsgi
   - fas_server
   - fedmsg/base
diff --git a/playbooks/groups/fas3.yml b/playbooks/groups/fas3.yml
index 021b49245..a00fbdacd 100644
--- a/playbooks/groups/fas3.yml
+++ b/playbooks/groups/fas3.yml
@@ -21,7 +21,6 @@
   - collectd/base
   - rsyncd
   - memcached
-  - apache
   - mod_wsgi
   - fas3_server
   - fedmsg/base
diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml
index ec2989bdf..13ba0acc4 100644
--- a/playbooks/groups/fedocal.yml
+++ b/playbooks/groups/fedocal.yml
@@ -20,7 +20,6 @@
   - sudo
   - { role: openvpn/client,
       when: env != "staging" }
-  - apache
   - mod_wsgi
   - collectd/base
 
diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml
index 99fe0eb79..7bab6e67b 100644
--- a/playbooks/groups/github2fedmsg.yml
+++ b/playbooks/groups/github2fedmsg.yml
@@ -26,7 +26,6 @@
   - sudo
   - { role: openvpn/client,
       when: env != "staging" }
-  - apache
   - mod_wsgi
 
   tasks:
diff --git a/playbooks/groups/ipsilon.yml b/playbooks/groups/ipsilon.yml
index 9bbccdfb0..d2b3d4778 100644
--- a/playbooks/groups/ipsilon.yml
+++ b/playbooks/groups/ipsilon.yml
@@ -25,7 +25,6 @@
   - sudo
   - { role: openvpn/client,
       when: env != "staging" }
-  - apache
   - mod_wsgi
 
   tasks:
diff --git a/playbooks/groups/kerneltest.yml b/playbooks/groups/kerneltest.yml
index 221b1d31d..a665d5087 100644
--- a/playbooks/groups/kerneltest.yml
+++ b/playbooks/groups/kerneltest.yml
@@ -26,7 +26,6 @@
   - sudo
   - { role: openvpn/client,
       when: env != "staging" }
-  - apache
   - mod_wsgi
 
   tasks:
diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml
index b3d0da06b..882802271 100644
--- a/playbooks/groups/mailman.yml
+++ b/playbooks/groups/mailman.yml
@@ -24,7 +24,6 @@
   - sudo
   - { role: openvpn/client,
       when: env != "staging" }
-  - apache
   - spamassassin
   - mod_wsgi
 
diff --git a/playbooks/groups/mirrorlist2.yml b/playbooks/groups/mirrorlist2.yml
index aea46eb7a..66ad9101e 100644
--- a/playbooks/groups/mirrorlist2.yml
+++ b/playbooks/groups/mirrorlist2.yml
@@ -55,7 +55,6 @@
   - hosts
   - fas_client
   - collectd/base
-  - apache
   - mod_wsgi
   - httpd/mod_ssl
 
diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml
index 34d4bd3a8..3b7cfc1c2 100644
--- a/playbooks/groups/noc.yml
+++ b/playbooks/groups/noc.yml
@@ -21,7 +21,6 @@
   - sudo
   - { role: openvpn/client,
       when: env != "staging" }
-  - apache
   - mod_wsgi
 
   tasks:
diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml
index 3c49b3523..cdc1297de 100644
--- a/playbooks/groups/notifs-web.yml
+++ b/playbooks/groups/notifs-web.yml
@@ -22,7 +22,6 @@
   - hosts
   - fas_client
   - collectd/base
-  - apache
   - mod_wsgi
   - fedmsg/base
   - notifs/frontend
diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml
index 5237609ba..d9524d0c1 100644
--- a/playbooks/groups/nuancier.yml
+++ b/playbooks/groups/nuancier.yml
@@ -25,7 +25,6 @@
   - sudo
   - { role: openvpn/client,
       when: env != "staging" }
-  - apache
   - mod_wsgi
 
   tasks:
diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml
index a7f8505ff..86f5b00fe 100644
--- a/playbooks/groups/packages.yml
+++ b/playbooks/groups/packages.yml
@@ -26,7 +26,6 @@
   - sudo
   - { role: openvpn/client,
       when: env != "staging" }
-  - apache
   - mod_wsgi
 
   tasks:
diff --git a/playbooks/groups/pdc.yml b/playbooks/groups/pdc.yml
index f57bed892..676837399 100644
--- a/playbooks/groups/pdc.yml
+++ b/playbooks/groups/pdc.yml
@@ -41,7 +41,6 @@
   roles:
   - role: openvpn/client
     when: env != "staging"
-  - apache
   - mod_wsgi
   - fedmsg/base
   - pdc/frontend
diff --git a/playbooks/groups/pkgdb.yml b/playbooks/groups/pkgdb.yml
index 9c3cc4dbf..b4c61af4f 100644
--- a/playbooks/groups/pkgdb.yml
+++ b/playbooks/groups/pkgdb.yml
@@ -24,7 +24,6 @@
   - sudo
   - { role: openvpn/client,
       when: env != "staging" }
-  - apache
   - mod_wsgi
 
   tasks:
diff --git a/playbooks/groups/statscache.yml b/playbooks/groups/statscache.yml
index a0a61ad24..f7404a93d 100644
--- a/playbooks/groups/statscache.yml
+++ b/playbooks/groups/statscache.yml
@@ -43,7 +43,6 @@
   - include: "{{ handlers }}/restart_services.yml"
 
   roles:
-  - apache
   - mod_wsgi
   - role: openvpn/client
     when: env != "staging"
diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml
index 537694fb2..6ba29ad57 100644
--- a/playbooks/groups/sundries.yml
+++ b/playbooks/groups/sundries.yml
@@ -22,7 +22,6 @@
   - hosts
   - fas_client
   - collectd/base
-  - apache
   - mod_wsgi
   - geoip
   - geoip-city-wsgi/app
diff --git a/playbooks/groups/tagger.yml b/playbooks/groups/tagger.yml
index f78186836..db988da93 100644
--- a/playbooks/groups/tagger.yml
+++ b/playbooks/groups/tagger.yml
@@ -26,7 +26,6 @@
   - sudo
   - { role: openvpn/client,
       when: env != "staging" }
-  - apache
   - mod_wsgi
 
   tasks:
diff --git a/playbooks/groups/zanata2fedmsg.yml b/playbooks/groups/zanata2fedmsg.yml
index 0628d17e8..424c6174a 100644
--- a/playbooks/groups/zanata2fedmsg.yml
+++ b/playbooks/groups/zanata2fedmsg.yml
@@ -26,7 +26,6 @@
   - sudo
   - { role: openvpn/client,
       when: env != "staging" }
-  - apache
   - mod_wsgi
 
   tasks:
diff --git a/playbooks/hosts/grafana.cloud.fedoraproject.org.yml b/playbooks/hosts/grafana.cloud.fedoraproject.org.yml
index 193303157..a1fccf4dd 100644
--- a/playbooks/hosts/grafana.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/grafana.cloud.fedoraproject.org.yml
@@ -23,7 +23,6 @@
   roles:
   - base
   - rkhunter
-  - apache
   - mod_wsgi
   #- graphite/graphite
   #- graphite/statsd
diff --git a/playbooks/hosts/graphite.fedorainfracloud.org.yml b/playbooks/hosts/graphite.fedorainfracloud.org.yml
index d04bc3855..a80e64e65 100644
--- a/playbooks/hosts/graphite.fedorainfracloud.org.yml
+++ b/playbooks/hosts/graphite.fedorainfracloud.org.yml
@@ -23,7 +23,6 @@
   roles:
   - base
   - rkhunter
-  - apache
   - mod_wsgi
   - certbot
   - graphite/graphite
diff --git a/playbooks/hosts/iddev.fedorainfracloud.org.yml b/playbooks/hosts/iddev.fedorainfracloud.org.yml
index 848a8c1f4..d96cc71f3 100644
--- a/playbooks/hosts/iddev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/iddev.fedorainfracloud.org.yml
@@ -23,7 +23,6 @@
   roles:
   - sudo
   - hosts
-  - apache
   - mod_wsgi
   - base
 
diff --git a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
index 31185e2a0..d0fb1dd57 100644
--- a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
@@ -32,7 +32,6 @@
   roles:
   - sudo
   - hosts
-  - apache
   - mod_wsgi
   - base
 
diff --git a/playbooks/hosts/modernpaste.fedorainfracloud.org.yml b/playbooks/hosts/modernpaste.fedorainfracloud.org.yml
index 7d07691cc..67150966e 100644
--- a/playbooks/hosts/modernpaste.fedorainfracloud.org.yml
+++ b/playbooks/hosts/modernpaste.fedorainfracloud.org.yml
@@ -23,7 +23,6 @@
   roles:
   - sudo
   - hosts
-  - apache
   - mod_wsgi
   - base