Fix apache collectd plugins for OSP 16

This patch introduces the following changes.
1. Steps have been added to the main.yml playbook to
support the apache_undercloud_collectd_plugin for OSP 16.
2. Since apache is not installed on controllers in OSP 16,
the apache_controller_collectd_plugin has been deprecated for
OSP>16.

Closes-Bug: 1954419

Change-Id: Ie7b48ef33b77c6bdd59903e533c477945523bf7c

ansible/install/group_vars/all.yml

@@ -201,6 +201,8 @@ collectd_prometheus: false
 apache_undercloud_collectd_plugin: false
 apache_undercloud_mod_status_port: 5001
 # Overcloud Controller
+# Apache is not installed on controllers from RHOSP 16(Train) onwards.
+# This option can be enabled only for RHOSP<16.
 apache_controller_collectd_plugin: false
 apache_controller_mod_status_port: 5001
 

ansible/install/roles/collectd/tasks/main.yml

@@ -102,6 +102,29 @@
   ignore_errors: yes
   when: (rhosp_version is version('16.2', '<') and 'Controller' in group_names and sqlalchemy_collectd_plugin)
 
+# Apache Monitoring
+- name: Deploy Apache mod_status conf
+  template:
+    src: 00-browbeat_mod_status.conf.j2
+    dest: /etc/httpd/conf.d/00-browbeat_mod_status.conf
+    owner: root
+    group: root
+  become: true
+  when: "('Undercloud' in group_names and apache_undercloud_collectd_plugin)"
+
+- name: (Undercloud) Allow httpd to listen to port ({{apache_undercloud_mod_status_port}})
+  command: "/usr/sbin/semanage port -m -t http_port_t -p tcp {{apache_undercloud_mod_status_port}}"
+  become: true
+  when: "('Undercloud' in group_names and apache_undercloud_collectd_plugin)"
+
+- name: Restart Apache
+  service:
+    name: httpd
+    state: restarted
+    enabled: true
+  become: true
+  when: "('Undercloud' in group_names and apache_undercloud_collectd_plugin)"
+# End Apache Monitoring
 
 # CephStorage OSD monitoring
 # Only Monitors a single OSD on each CephStorage Node

ansible/install/roles/collectd/templates/controller.collectd.conf.j2

@@ -23,7 +23,7 @@ LoadPlugin "logfile"
 </Plugin>
 
 LoadPlugin write_graphite
-{% if apache_controller_collectd_plugin %}
+{% if rhosp_version is version ('16', '<') and apache_controller_collectd_plugin %}
 LoadPlugin apache
 {% endif %}
 {% if collectd_prometheus %}
@@ -106,7 +106,7 @@ PreCacheChain "PreCache"
 </Plugin>
 {% endif %}
 
-{% if apache_controller_collectd_plugin %}
+{% if rhosp_version is version ('16', '<') and apache_controller_collectd_plugin %}
 
 <Plugin apache>
   <Instance "status">