Merge pull request #836 from paramite/OSPRH12089-OSPRH12088

openshift-merge-bot[bot] · web-flow · commit c7cc7edab5c5 · 2024-12-05T19:56:06.000Z
Fix blocked update because of health checks deployment
diff --git a/roles/edpm_iscsid/tasks/healthchecks.yml b/roles/edpm_iscsid/tasks/healthchecks.yml
@@ -0,0 +1,30 @@
+---
+
+- name: Gather user fact
+  ansible.builtin.setup:
+    gather_subset:
+      - "!all"
+      - "!min"
+      - "user"
+  when:
+    - ansible_user is undefined
+
+- name: Ensure base directory for health checks exists
+  become: true
+  ansible.builtin.file:
+    path: /var/lib/openstack/healthchecks
+    state: directory
+    setype: container_file_t
+    owner: "{{ ansible_user | default(ansible_user_id) }}"
+    group: "{{ ansible_user | default(ansible_user_id) }}"
+    mode: '0755'
+
+- name: Deploy iscsi health check script
+  become: true
+  ansible.builtin.copy:
+    src: healthchecks/iscsid/
+    dest: "/var/lib/openstack/healthchecks/iscsid"
+    setype: container_file_t
+    owner: "{{ ansible_user | default(ansible_user_id) }}"
+    group: "{{ ansible_user | default(ansible_user_id) }}"
+    mode: '0700'
diff --git a/roles/edpm_iscsid/tasks/install.yml b/roles/edpm_iscsid/tasks/install.yml
@@ -30,7 +30,6 @@
         - {'path': /var/lib/iscsi, 'setype': container_file_t}
         - {'path': /var/lib/config-data, 'setype': container_file_t, 'selevel': s0, 'mode': '0755'}
         - {'path': /var/lib/config-data/ansible-generated/iscsid, 'setype': container_file_t, 'mode': '0755'}
-        - {'path': /var/lib/openstack/healthchecks, 'setype': container_file_t, 'mode': '0755'}
 
     - name: Stat /lib/systemd/system/iscsid.socket
       ansible.builtin.stat:
@@ -56,12 +55,3 @@
         - ansible_facts.services["iscsi.service"] is defined
         - ansible_facts.services["iscsi.service"]["status"] != "not-found"
         - ansible_facts.services["iscsi.service"]["status"] == "enabled"
-
-    - name: Deploy iscsi health check script
-      ansible.builtin.copy:
-        src: healthchecks/iscsid/
-        dest: "/var/lib/openstack/healthchecks/iscsid"
-        setype: container_file_t
-        owner: "{{ ansible_user | default(ansible_user_id) }}"
-        group: "{{ ansible_user | default(ansible_user_id) }}"
-        mode: '0700'
diff --git a/roles/edpm_iscsid/tasks/run.yml b/roles/edpm_iscsid/tasks/run.yml
@@ -19,6 +19,10 @@
     name: edpm_container_manage
     tasks_from: shutdown.yml
 
+- name: Update iscsi health check script
+  ansible.builtin.include_tasks:
+    file: healthchecks.yml
+
 - name: Manage iscsid containers
   ansible.builtin.include_role:
     name: edpm_container_standalone
diff --git a/roles/edpm_logrotate_crond/tasks/healthchecks.yml b/roles/edpm_logrotate_crond/tasks/healthchecks.yml
@@ -0,0 +1,30 @@
+---
+
+- name: Gather user fact
+  ansible.builtin.setup:
+    gather_subset:
+      - "!all"
+      - "!min"
+      - "user"
+  when:
+    - ansible_user is undefined
+
+- name: Ensure base directory for health checks exists
+  become: true
+  ansible.builtin.file:
+    path: /var/lib/openstack/healthchecks
+    state: directory
+    setype: container_file_t
+    owner: "{{ ansible_user | default(ansible_user_id) }}"
+    group: "{{ ansible_user | default(ansible_user_id) }}"
+    mode: '0755'
+
+- name: Deploy logrotate_crond health check script
+  become: true
+  ansible.builtin.copy:
+    src: healthchecks/logrotate_crond/
+    dest: /var/lib/openstack/healthchecks/logrotate_crond
+    setype: container_file_t
+    owner: "{{ ansible_user | default(ansible_user_id) }}"
+    group: "{{ ansible_user | default(ansible_user_id) }}"
+    mode: '0700'
diff --git a/roles/edpm_logrotate_crond/tasks/install.yml b/roles/edpm_logrotate_crond/tasks/install.yml
@@ -52,23 +52,3 @@
   when:
     - ansible_facts.selinux is defined
     - ansible_facts.selinux.status == "enabled"
-
-- name: Create a directory for container health checks
-  ansible.builtin.file:
-    path: /var/lib/openstack/healthchecks
-    state: directory
-    setype: container_file_t
-    owner: "{{ ansible_user | default(ansible_user_id) }}"
-    group: "{{ ansible_user | default(ansible_user_id) }}"
-    mode: '0755'
-  become: true
-
-- name: Deploy logrotate_crond health check script
-  ansible.builtin.copy:
-    src: healthchecks/logrotate_crond/
-    dest: /var/lib/openstack/healthchecks/logrotate_crond
-    setype: container_file_t
-    owner: "{{ ansible_user | default(ansible_user_id) }}"
-    group: "{{ ansible_user | default(ansible_user_id) }}"
-    mode: '0700'
-  become: true
diff --git a/roles/edpm_logrotate_crond/tasks/run.yml b/roles/edpm_logrotate_crond/tasks/run.yml
@@ -14,6 +14,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+- name: Update logrotate_crond health check script
+  ansible.builtin.include_tasks:
+    file: healthchecks.yml
 
 - name: Manage logrotate_crond containers
   ansible.builtin.include_role:
diff --git a/roles/edpm_multipathd/tasks/healthchecks.yml b/roles/edpm_multipathd/tasks/healthchecks.yml
@@ -0,0 +1,30 @@
+---
+
+- name: Gather user fact
+  ansible.builtin.setup:
+    gather_subset:
+      - "!all"
+      - "!min"
+      - "user"
+  when:
+    - ansible_user is undefined
+
+- name: Ensure base directory for health checks exists
+  become: true
+  ansible.builtin.file:
+    path: /var/lib/openstack/healthchecks
+    state: directory
+    setype: container_file_t
+    owner: "{{ ansible_user | default(ansible_user_id) }}"
+    group: "{{ ansible_user | default(ansible_user_id) }}"
+    mode: '0755'
+
+- name: Deploy multipathd health check script
+  become: true
+  ansible.builtin.copy:
+    src: healthchecks/multipathd/
+    dest: /var/lib/openstack/healthchecks/multipathd
+    setype: container_file_t
+    owner: "{{ ansible_user | default(ansible_user_id) }}"
+    group: "{{ ansible_user | default(ansible_user_id) }}"
+    mode: '0700'
diff --git a/roles/edpm_multipathd/tasks/install.yml b/roles/edpm_multipathd/tasks/install.yml
@@ -61,21 +61,3 @@
         state: directory
         mode: "0755"
         setype: container_file_t
-
-    - name: Create a directory for container health checks
-      ansible.builtin.file:
-        path: /var/lib/openstack/healthchecks
-        state: directory
-        setype: container_file_t
-        owner: "{{ ansible_user | default(ansible_user_id) }}"
-        group: "{{ ansible_user | default(ansible_user_id) }}"
-        mode: '0755'
-
-    - name: Deploy multipathd health check script
-      ansible.builtin.copy:
-        src: healthchecks/multipathd/
-        dest: /var/lib/openstack/healthchecks/multipathd
-        setype: container_file_t
-        owner: "{{ ansible_user | default(ansible_user_id) }}"
-        group: "{{ ansible_user | default(ansible_user_id) }}"
-        mode: '0700'
diff --git a/roles/edpm_multipathd/tasks/run.yml b/roles/edpm_multipathd/tasks/run.yml
@@ -19,6 +19,10 @@
     name: edpm_container_manage
     tasks_from: shutdown.yml
 
+- name: Update multipathd health check script
+  ansible.builtin.include_tasks:
+    file: healthchecks.yml
+
 - name: Manage multipathd containers
   ansible.builtin.include_role:
     name: edpm_container_standalone
diff --git a/roles/edpm_neutron_metadata/tasks/healthchecks.yml b/roles/edpm_neutron_metadata/tasks/healthchecks.yml
@@ -0,0 +1,30 @@
+---
+
+- name: Gather user fact
+  ansible.builtin.setup:
+    gather_subset:
+      - "!all"
+      - "!min"
+      - "user"
+  when:
+    - ansible_user is undefined
+
+- name: Ensure base directory for health checks exists
+  become: true
+  ansible.builtin.file:
+    path: /var/lib/openstack/healthchecks
+    state: directory
+    setype: container_file_t
+    owner: "{{ ansible_user | default(ansible_user_id) }}"
+    group: "{{ ansible_user | default(ansible_user_id) }}"
+    mode: '0755'
+
+- name: Deploy ovn_metadata_agent health check script
+  become: true
+  ansible.builtin.copy:
+    src: healthchecks/ovn_metadata_agent/
+    dest: /var/lib/openstack/healthchecks/ovn_metadata_agent
+    setype: container_file_t
+    owner: "{{ ansible_user | default(ansible_user_id) }}"
+    group: "{{ ansible_user | default(ansible_user_id) }}"
+    mode: '0700'
diff --git a/roles/edpm_neutron_metadata/tasks/install.yml b/roles/edpm_neutron_metadata/tasks/install.yml
@@ -37,7 +37,6 @@
     - {'path': "{{ edpm_neutron_metadata_agent_lib_dir }}/kill_scripts", "mode": "0755"}
     - {'path': "{{ edpm_neutron_metadata_agent_lib_dir }}/ovn-metadata-proxy", "mode": "0755"}
     - {'path': "{{ edpm_neutron_metadata_agent_lib_dir }}/external/pids", "mode": "0755"}
-    - {'path': /var/lib/openstack/healthchecks, "mode": "0755"}
 
 - name: Gather SELinux fact if needed
   when:
@@ -75,13 +74,3 @@
     mode: "0755"
   with_items:
     - {"src": "wrappers/kill-script.j2", "dest": "haproxy-kill"}
-
-- name: Deploy ovn_metadata_agent health check script
-  ansible.builtin.copy:
-    src: healthchecks/ovn_metadata_agent/
-    dest: /var/lib/openstack/healthchecks/ovn_metadata_agent
-    setype: container_file_t
-    owner: "{{ ansible_user | default(ansible_user_id) }}"
-    group: "{{ ansible_user | default(ansible_user_id) }}"
-    mode: '0700'
-  become: true
diff --git a/roles/edpm_neutron_metadata/tasks/run.yml b/roles/edpm_neutron_metadata/tasks/run.yml
@@ -32,6 +32,10 @@
     name: edpm_container_manage
     tasks_from: shutdown.yml
 
+- name: Update ovn_metadata_agent health check script
+  ansible.builtin.include_tasks:
+    file: healthchecks.yml
+
 - name: Run ovn_metadata_agent container
   ansible.builtin.include_role:
     name: osp.edpm.edpm_container_standalone
diff --git a/roles/edpm_ovn/tasks/healthchecks.yml b/roles/edpm_ovn/tasks/healthchecks.yml
@@ -0,0 +1,30 @@
+---
+
+- name: Gather user fact
+  ansible.builtin.setup:
+    gather_subset:
+      - "!all"
+      - "!min"
+      - "user"
+  when:
+    - ansible_user is undefined
+
+- name: Ensure base directory for health checks exists
+  become: true
+  ansible.builtin.file:
+    path: /var/lib/openstack/healthchecks
+    state: directory
+    setype: container_file_t
+    owner: "{{ ansible_user | default(ansible_user_id) }}"
+    group: "{{ ansible_user | default(ansible_user_id) }}"
+    mode: '0755'
+
+- name: Deploy ovn_controller health check script
+  become: true
+  ansible.builtin.copy:
+    src: healthchecks/ovn_controller/
+    dest: /var/lib/openstack/healthchecks/ovn_controller
+    setype: container_file_t
+    owner: "{{ ansible_user | default(ansible_user_id) }}"
+    group: "{{ ansible_user | default(ansible_user_id) }}"
+    mode: '0700'
diff --git a/roles/edpm_ovn/tasks/install.yml b/roles/edpm_ovn/tasks/install.yml
@@ -34,8 +34,6 @@
   loop:
     - {'path': /var/lib/edpm-config/firewall, 'mode': '0750'}
     - {'path': /var/lib/openvswitch/ovn, "owner": "openvswitch", "group": "openvswitch"}
-    - {'path': /var/lib/openstack/healthchecks, 'mode': '0755'}
-
 
 - name: Gather SELinux fact if needed
   when:
@@ -55,13 +53,3 @@
   when:
     - ansible_facts.selinux is defined
     - ansible_facts.selinux.status == "enabled"
-
-- name: Deploy ovn_controller health check script
-  ansible.builtin.copy:
-    src: healthchecks/ovn_controller/
-    dest: /var/lib/openstack/healthchecks/ovn_controller
-    setype: container_file_t
-    owner: "{{ ansible_user | default(ansible_user_id) }}"
-    group: "{{ ansible_user | default(ansible_user_id) }}"
-    mode: '0700'
-  become: true
diff --git a/roles/edpm_ovn/tasks/run.yml b/roles/edpm_ovn/tasks/run.yml
@@ -32,6 +32,10 @@
     name: edpm_container_manage
     tasks_from: shutdown.yml
 
+- name: Update ovn_controller health check script
+  ansible.builtin.include_tasks:
+    file: healthchecks.yml
+
 - name: Run ovn_controller container
   ansible.builtin.include_role:
     name: osp.edpm.edpm_container_standalone
diff --git a/roles/edpm_telemetry/defaults/main.yml b/roles/edpm_telemetry/defaults/main.yml
@@ -49,3 +49,7 @@ edpm_telemetry_healthcheck_sources:
 #  kepler: exporter
 # If telemetry services should have health checks enabled
 edpm_telemetry_healthcheck: true
+# List of exporters to be deployed in the compute node
+edpm_telemetry_enabled_exporters:
+  - ceilometer_agent_compute
+  - node_exporter
diff --git a/roles/edpm_telemetry/meta/argument_specs.yml b/roles/edpm_telemetry/meta/argument_specs.yml
@@ -58,3 +58,7 @@ argument_specs:
           Contains information about distribution of container health check scripts.
           Keys state for container names and value is name of a script directory
           from module's files directory.
+      edpm_telemetry_enabled_exporters:
+        type: list
+        required: true
+        description: "List of exporters to be deployed in the compute node"
diff --git a/roles/edpm_telemetry/tasks/exporter.yml b/roles/edpm_telemetry/tasks/exporter.yml
@@ -0,0 +1,26 @@
+---
+
+- name: Deploy health check script
+  ansible.builtin.copy:
+    src: "healthchecks/{{ edpm_telemetry_healthcheck_sources[exporter] }}/"
+    dest: "/var/lib/openstack/healthchecks/{{ exporter }}"
+    setype: container_file_t
+    owner: "{{ ansible_user | default(ansible_user_id) }}"
+    group: "{{ ansible_user | default(ansible_user_id) }}"
+    mode: '0700'
+  become: true
+
+- name: Deploy exporter container
+  ansible.builtin.include_role:
+    name: osp.edpm.edpm_container_manage
+  vars:
+    edpm_container_manage_config: "{{ edpm_telemetry_config_dest }}"
+    edpm_container_manage_healthcheck_disabled: true
+    edpm_container_manage_config_patterns: "{{ exporter }}.json"
+    edpm_container_manage_clean_orphans: false
+
+- name: Restart exporter container
+  become: true
+  ansible.builtin.systemd:
+    state: restarted
+    name: "edpm_{{ exporter }}.service"
diff --git a/roles/edpm_telemetry/tasks/install.yml b/roles/edpm_telemetry/tasks/install.yml
