diff --git a/vars/debian.yml b/vars/debian.yml index d32b322..a7696fb 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -39,13 +39,3 @@ aodh_test_distro_packages: aodh_oslomsg_amqp1_distro_packages: - libsasl2-modules - sasl2-bin - -# NOTE(noonedeadpunk): These variables are left for migration from apache to uwsgi -# which was introduced during train release. They can be dropped afterwards. -aodh_system_service_name: apache2 -aodh_apache_config: - - "/etc/apache2/sites-available/aodh-httpd.conf" - - "/etc/apache2/sites-enabled/aodh-httpd.conf" - - "/etc/apache2/sites-enabled/aodh-api.conf" - - "/etc/apache2/sites-available/aodh-api.conf" -aodh_apache_ports: "/etc/apache2/ports.conf" diff --git a/vars/redhat.yml b/vars/redhat.yml index 3c55dd4..b444743 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -41,9 +41,3 @@ aodh_oslomsg_amqp1_distro_packages: - cyrus-sasl-plain - cyrus-sasl-md5 -# NOTE(noonedeadpunk): These variables are left for migration from apache to uwsgi -# which was introduced during train release. They can be dropped afterwards. -aodh_system_service_name: httpd -aodh_apache_config: - - "/etc/httpd/conf.d/aodh-httpd.conf" -aodh_apache_ports: "/etc/httpd/conf.d/ports.conf"