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
This commit is contained in:
Jeffrey Zhang 2017-03-13 13:26:43 +08:00
parent c0df4ab8b6
commit 0defa3b3ea
5 changed files with 43 additions and 0 deletions

View File

@ -31,6 +31,7 @@
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 }}"
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:
action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}"
@ -46,6 +47,7 @@
or policy_json.changed | bool
or ceilometer_events.changed | bool
or ceilometer_notification_container.changed | bool
or panko_conf.changed | bool
- name: Restart ceilometer-central container
vars:
@ -78,6 +80,7 @@
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 }}"
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:
action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}"
@ -92,6 +95,7 @@
or ceilometer_conf.changed | bool
or policy_json.changed | bool
or ceilometer_collector_container.changed | bool
or panko_conf.changed | bool
- name: Restart ceilometer-compute container
vars:

View File

@ -84,6 +84,29 @@
notify:
- 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
local_action: stat path="{{ node_custom_config }}/ceilometer/policy.json"
register: ceilometer_policy

View File

@ -13,6 +13,13 @@
"owner": "ceilometer",
"perm": "0600",
"optional": true
},
{
"source": "{{ container_config_directory }}/panko.conf",
"dest": "/etc/panko/panko.conf",
"owner": "ceilometer",
"perm": "0600",
"optional": true
}
]
}

View File

@ -31,6 +31,13 @@
"owner": "ceilometer",
"perm": "0600",
"optional": true
},
{
"source": "{{ container_config_directory }}/panko.conf",
"dest": "/etc/panko/panko.conf",
"owner": "ceilometer",
"perm": "0600",
"optional": true
}
]
}

View File

@ -428,6 +428,8 @@
- name: Apply role ceilometer
gather_facts: false
vars_files:
- "roles/panko/defaults/main.yml"
hosts:
- ceilometer
- compute