Skip to content

Commit b0b47e5

Browse files
committed
Disable podman_exporter deployment by default
We need to disable podman_exporter deployment by default until we get the exporter image downstream. Resolves: OSPRH-12089
1 parent 5f05c09 commit b0b47e5

File tree

4 files changed

+46
-61
lines changed

4 files changed

+46
-61
lines changed

roles/edpm_telemetry/defaults/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,7 @@ edpm_telemetry_healthcheck_sources:
4949
# kepler: exporter
5050
# If telemetry services should have health checks enabled
5151
edpm_telemetry_healthcheck: true
52+
# List of ceilometer agents to be stopped during EDPM adoption
53+
edpm_telemetry_enabled_exporters:
54+
- ceilometer_agent_compute
55+
- node_exporter

roles/edpm_telemetry/meta/argument_specs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,7 @@ argument_specs:
5858
Contains information about distribution of container health check scripts.
5959
Keys state for container names and value is name of a script directory
6060
from module's files directory.
61+
edpm_telemetry_enabled_exporters:
62+
type: list
63+
required: true
64+
description: "List of exporters to be deployed in the compute node"
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
3+
- name: Deploy health check script
4+
ansible.builtin.copy:
5+
src: "healthchecks/{{ edpm_telemetry_healthcheck_sources[exporter] }}/"
6+
dest: "/var/lib/openstack/healthchecks/{{ exporter }}"
7+
setype: container_file_t
8+
owner: "{{ ansible_user | default(ansible_user_id) }}"
9+
group: "{{ ansible_user | default(ansible_user_id) }}"
10+
mode: '0700'
11+
become: true
12+
13+
- name: Deploy exporter container
14+
ansible.builtin.include_role:
15+
name: osp.edpm.edpm_container_manage
16+
vars:
17+
edpm_container_manage_config: "{{ edpm_telemetry_config_dest }}"
18+
edpm_container_manage_healthcheck_disabled: true
19+
edpm_container_manage_config_patterns: "{{ exporter }}.json"
20+
edpm_container_manage_clean_orphans: false
21+
22+
- name: Restart exporter container
23+
become: true
24+
ansible.builtin.systemd:
25+
state: restarted
26+
name: "edpm_{{ exporter }}.service"

roles/edpm_telemetry/tasks/install.yml

Lines changed: 12 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -24,69 +24,20 @@
2424
mode: '0755'
2525
become: true
2626

27-
- name: Deploy telemetry health check scripts
28-
ansible.builtin.copy:
29-
src: "healthchecks/{{ item.value }}/"
30-
dest: "/var/lib/openstack/healthchecks/{{ item.key }}"
31-
setype: container_file_t
32-
owner: "{{ ansible_user | default(ansible_user_id) }}"
33-
group: "{{ ansible_user | default(ansible_user_id) }}"
34-
mode: '0700'
27+
- name: Start podman.socket service
28+
ansible.builtin.systemd_service:
29+
name: podman.socket
30+
state: started
31+
enabled: true
3532
become: true
36-
loop: "{{ edpm_telemetry_healthcheck_sources | dict2items }}"
37-
38-
- name: Deploy ceilometer containers
39-
ansible.builtin.include_role:
40-
name: osp.edpm.edpm_container_manage
41-
vars:
42-
edpm_container_manage_config: "{{ edpm_telemetry_config_dest }}"
43-
edpm_container_manage_healthcheck_disabled: true
44-
edpm_container_manage_config_patterns: "ceilometer_agent_compute.json"
45-
edpm_container_manage_clean_orphans: false
33+
when: '"podman_exporter" in edpm_telemetry_enabled_exporters'
4634

47-
- name: Deploy node_exporter container
48-
ansible.builtin.include_role:
49-
name: osp.edpm.edpm_container_manage
50-
vars:
51-
edpm_container_manage_config: "{{ edpm_telemetry_config_dest }}"
52-
edpm_container_manage_healthcheck_disabled: true
53-
edpm_container_manage_config_patterns: "node_exporter.json"
54-
edpm_container_manage_clean_orphans: false
55-
56-
- name: Deploy podman_exporter container
57-
block:
58-
- name: Start podman.socket service
59-
ansible.builtin.systemd_service:
60-
name: podman.socket
61-
state: started
62-
enabled: true
63-
become: true
64-
- name: Start podman_exporter container
65-
ansible.builtin.include_role:
66-
name: osp.edpm.edpm_container_manage
67-
vars:
68-
edpm_container_manage_config: "{{ edpm_telemetry_config_dest }}"
69-
edpm_container_manage_healthcheck_disabled: true
70-
edpm_container_manage_config_patterns: "podman_exporter.json"
71-
edpm_container_manage_clean_orphans: false
72-
73-
- name: Restart node_exporter
74-
become: true
75-
ansible.builtin.systemd:
76-
state: restarted
77-
name: edpm_node_exporter.service
78-
79-
- name: Restart podman_exporter
80-
become: true
81-
ansible.builtin.systemd:
82-
state: restarted
83-
name: edpm_podman_exporter.service
84-
85-
- name: Restart ceilometer compute
86-
become: true
87-
ansible.builtin.systemd:
88-
state: restarted
89-
name: edpm_ceilometer_agent_compute.service
35+
- name: Deploy enabled exporters
36+
ansible.builtin.include_tasks:
37+
file: exporter.yml
38+
loop: "{{ edpm_telemetry_enabled_exporters }}"
39+
loop_control:
40+
loop_var: exporter
9041

9142
- name: List deployed health check scripts
9243
ansible.builtin.find:

0 commit comments

Comments
 (0)