Skip to content
Snippets Groups Projects
Commit 0defa3b3 authored by Jeffrey Zhang's avatar Jeffrey Zhang
Browse files

Add panko.conf file in ceilometer container

When using panko event dispatcher and publisher in ceilometer, it
depends on panko.conf file.

Change-Id: Ie91c072b233597758955b70bd526b2603b86e995
Closes-Bug: #1672241
parent c0df4ab8
No related branches found
No related tags found
No related merge requests found
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
ceilometer_conf: "{{ ceilometer_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" ceilometer_conf: "{{ ceilometer_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_json: "{{ ceilometer_policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}" policy_json: "{{ ceilometer_policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
ceilometer_notification_container: "{{ check_ceilometer_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" ceilometer_notification_container: "{{ check_ceilometer_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
panko_conf: "{{ panko_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
kolla_docker: kolla_docker:
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
...@@ -46,6 +47,7 @@ ...@@ -46,6 +47,7 @@
or policy_json.changed | bool or policy_json.changed | bool
or ceilometer_events.changed | bool or ceilometer_events.changed | bool
or ceilometer_notification_container.changed | bool or ceilometer_notification_container.changed | bool
or panko_conf.changed | bool
- name: Restart ceilometer-central container - name: Restart ceilometer-central container
vars: vars:
...@@ -78,6 +80,7 @@ ...@@ -78,6 +80,7 @@
ceilometer_conf: "{{ ceilometer_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" ceilometer_conf: "{{ ceilometer_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_json: "{{ ceilometer_policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}" policy_json: "{{ ceilometer_policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
ceilometer_collector_container: "{{ check_ceilometer_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" ceilometer_collector_container: "{{ check_ceilometer_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
panko_conf: "{{ panko_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
kolla_docker: kolla_docker:
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
...@@ -92,6 +95,7 @@ ...@@ -92,6 +95,7 @@
or ceilometer_conf.changed | bool or ceilometer_conf.changed | bool
or policy_json.changed | bool or policy_json.changed | bool
or ceilometer_collector_container.changed | bool or ceilometer_collector_container.changed | bool
or panko_conf.changed | bool
- name: Restart ceilometer-compute container - name: Restart ceilometer-compute container
vars: vars:
......
...@@ -84,6 +84,29 @@ ...@@ -84,6 +84,29 @@
notify: notify:
- Restart ceilometer-notification container - Restart ceilometer-notification container
- name: Copying over panko.conf
vars:
service_require_panko_conf:
- ceilometer-notification
- ceilometer-collector
merge_configs:
sources:
- ../panko/templates/panko.conf.j2
- "{{ node_custom_config }}/global.conf"
- "{{ node_custom_config }}/panko.conf"
- "{{ node_custom_config }}/panko/panko.conf"
- "{{ node_custom_config }}/panko/{{ inventory_hostname }}/panko.conf"
dest: "{{ node_config_directory }}/panko/panko.conf"
register: panko_confs
when:
- ceilometer_event_type == 'panko'
- item.value.enabled | bool
- inventory_hostname in groups[item.value.group]
- item.key in service_require_panko_conf
with_dict: "{{ ceilometer_services }}"
notify:
- "Restart {{ item.key }} container"
- name: Check if policies shall be overwritten - name: Check if policies shall be overwritten
local_action: stat path="{{ node_custom_config }}/ceilometer/policy.json" local_action: stat path="{{ node_custom_config }}/ceilometer/policy.json"
register: ceilometer_policy register: ceilometer_policy
......
...@@ -13,6 +13,13 @@ ...@@ -13,6 +13,13 @@
"owner": "ceilometer", "owner": "ceilometer",
"perm": "0600", "perm": "0600",
"optional": true "optional": true
},
{
"source": "{{ container_config_directory }}/panko.conf",
"dest": "/etc/panko/panko.conf",
"owner": "ceilometer",
"perm": "0600",
"optional": true
} }
] ]
} }
...@@ -31,6 +31,13 @@ ...@@ -31,6 +31,13 @@
"owner": "ceilometer", "owner": "ceilometer",
"perm": "0600", "perm": "0600",
"optional": true "optional": true
},
{
"source": "{{ container_config_directory }}/panko.conf",
"dest": "/etc/panko/panko.conf",
"owner": "ceilometer",
"perm": "0600",
"optional": true
} }
] ]
} }
...@@ -428,6 +428,8 @@ ...@@ -428,6 +428,8 @@
- name: Apply role ceilometer - name: Apply role ceilometer
gather_facts: false gather_facts: false
vars_files:
- "roles/panko/defaults/main.yml"
hosts: hosts:
- ceilometer - ceilometer
- compute - compute
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment