Remove apache to uwsgi migration tasks and variables

Change-Id: Idaec9f48bb1c7aff926071979773bca97f9ef2b3

handlers/main.yml

@@ -68,13 +68,3 @@
   listen:
     - "Restart gnocchi services"
     - "venv changed"
-
-# NOTE(noonedeadpunk): This task is created due to migration from apache to uwsgi
-# which was introduced during train release. It can be dropped afterwards.
-- name: Restart web server
-  service:
-    name: "{{ gnocchi_system_service_name }}"
-    enabled: yes
-    state: "restarted"
-    daemon_reload: yes
-  failed_when: false

tasks/gnocchi_post_install.yml

@@ -48,22 +48,3 @@
   notify:
     - Restart gnocchi services
     - Restart uwsgi services
-    - Restart web server
-
-# NOTE(noonedeadpunk): This task is created due to migration from apache to uwsgi
-# which was introduced during train release. It can be dropped afterwards.
-- name: Drop Apache related configs
-  file:
-    path: "{{ item }}"
-    state: absent
-  with_items: "{{ gnocchi_apache_config }}"
-  notify:
-   - Restart web server
-
-- name: Stop Apache listening on Gnocchi port
-  lineinfile:
-    path: "{{ gnocchi_apache_ports }}"
-    state: absent
-    line: "Listen {{ gnocchi_service_port }}"
-  notify:
-   - Restart web server

vars/debian.yml

@@ -25,11 +25,3 @@ gnocchi_devel_distro_packages:
 
 gnocchi_distro_packages:
   - libxml2
-
-# NOTE(noonedeadpunk): These variables are left for migration from apache to uwsgi
-# which was introduced during train release. They can be dropped afterwards.
-gnocchi_system_service_name: apache2
-gnocchi_apache_config:
-  - "/etc/apache2/sites-enabled/gnocchi-httpd.conf"
-  - "/etc/apache2/sites-available/gnocchi-httpd.conf"
-gnocchi_apache_ports: "/etc/apache2/ports.conf"

vars/redhat.yml

@@ -24,10 +24,3 @@ gnocchi_devel_distro_packages:
 
 gnocchi_distro_packages:
   - libxml2
-
-# NOTE(noonedeadpunk): These variables are left for migration from apache to uwsgi
-# which was introduced during train release. They can be dropped afterwards.
-gnocchi_system_service_name: httpd
-gnocchi_apache_config:
-  - "/etc/httpd/conf.d/gnocchi-httpd.conf"
-gnocchi_apache_ports: "/etc/httpd/conf.d/ports.conf"