openstack/kolla-ansible
Code Issues Proposed changes

Remove Vitrage Collector

Browse Source 
Vitrage Collector service has been removed from Vitrage in change:
Ie713456b2df96e24d0b15d2362a666162bfb4300.

Change-Id: I45023940c1d2573bfed49d4ce3fac16ed2d559e4
Signed-off-by: Bartosz Zurkowski <b.zurkowski@samsung.com>
Co-Authored-By: Kien Nguyen <kiennt65@viettel.com.vn>
This commit is contained in:
Bartosz Zurkowski 2018-12-16 17:14:12 +01:00 committed by Kien Nguyen
parent 2674344bbe
commit 7e85677020
12 changed files with 12 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/inventory/all-in-one
View File

@ -693,9 +693,6 @@ vitrage
[vitrage-graph:children]
vitrage
[vitrage-collector:children]
vitrage
[vitrage-ml:children]
vitrage

3
ansible/inventory/multinode
View File

@ -712,9 +712,6 @@ vitrage
[vitrage-graph:children]
vitrage
[vitrage-collector:children]
vitrage
[vitrage-ml:children]
vitrage

2
ansible/roles/common/templates/conf/filter/01-rewrite-0.12.conf.j2
View File

@ -31,6 +31,6 @@
rewriterule28 programname ^(ironic-api|ironic-conductor|ironic-inspector)$ openstack_python
rewriterule29 programname ^(panko-api|panko-dbsync)$ openstack_python
rewriterule30 programname ^(tacker-server|tacker-conductor)$ openstack_python
rewriterule31 programname ^(vitrage-collector|vitrage-ml|vitrage-notifier|vitrage-graph)$ openstack_python
rewriterule31 programname ^(vitrage-ml|vitrage-notifier|vitrage-graph)$ openstack_python
rewriterule32 programname ^(blazar-api|blazar-manager)$ openstack_python
</match>

2
ansible/roles/common/templates/conf/filter/01-rewrite-0.14.conf.j2
View File

@ -153,7 +153,7 @@
</rule>
<rule>
key programname
pattern ^(vitrage-collector|vitrage-ml|vitrage-notifier|vitrage-graph)$
pattern ^(vitrage-ml|vitrage-notifier|vitrage-graph)$
tag openstack_python
</rule>
<rule>

16
ansible/roles/vitrage/defaults/main.yml
View File

@ -24,17 +24,6 @@ vitrage_services:
mode: "http"
external: true
port: "{{ vitrage_api_port }}"
vitrage-collector:
container_name: vitrage_collector
group: vitrage-collector
enabled: true
image: "{{ vitrage_collector_image_full }}"
volumes:
- "{{ node_config_directory }}/vitrage-collector/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ kolla_dev_repos_directory ~ '/vitrage/vitrage:/var/lib/kolla/venv/lib/python2.7/site-packages/vitrage' if vitrage_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ vitrage_collector_dimensions }}"
vitrage-notifier:
container_name: vitrage_notifier
group: vitrage-notifier
@ -95,17 +84,12 @@ vitrage_notifier_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{
vitrage_notifier_tag: "{{ vitrage_tag }}"
vitrage_notifier_image_full: "{{ vitrage_notifier_image }}:{{ vitrage_notifier_tag }}"
vitrage_collector_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ vitrage_install_type }}-vitrage-collector"
vitrage_collector_tag: "{{ vitrage_tag }}"
vitrage_collector_image_full: "{{ vitrage_collector_image }}:{{ vitrage_collector_tag }}"
vitrage_ml_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ vitrage_install_type }}-vitrage-ml"
vitrage_ml_tag: "{{ vitrage_tag }}"
vitrage_ml_image_full: "{{ vitrage_ml_image }}:{{ vitrage_ml_tag }}"
vitrage_api_dimensions: "{{ default_container_dimensions }}"
vitrage_notifier_dimensions: "{{ default_container_dimensions }}"
vitrage_collector_dimensions: "{{ default_container_dimensions }}"
vitrage_graph_dimensions: "{{ default_container_dimensions }}"
vitrage_ml_dimensions: "{{ default_container_dimensions }}"

25
ansible/roles/vitrage/handlers/main.yml
View File

@ -24,31 +24,6 @@
or policy_overwriting.changed | bool
or vitrage_api_container.changed | bool
- name: Restart vitrage-collector container
vars:
service_name: "vitrage-collector"
service: "{{ vitrage_services[service_name] }}"
config_json: "{{ vitrage_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
vitrage_conf: "{{ vitrage_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_overwriting: "{{ vitrage_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}"
vitrage_collector_container: "{{ check_vitrage_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
become: true
kolla_docker:
action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}"
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
or vitrage_conf.changed | bool
or policy_overwriting.changed | bool
or vitrage_collector_container.changed | bool
- name: Restart vitrage-notifier container
vars:
service_name: "vitrage-notifier"

4
ansible/roles/vitrage/tasks/config.yml
View File

@ -42,7 +42,6 @@
with_dict: "{{ vitrage_services }}"
notify:
- Restart vitrage-api container
- Restart vitrage-collector container
- Restart vitrage-notifier container
- Restart vitrage-graph container
- Restart vitrage-ml container
@ -68,7 +67,6 @@
with_dict: "{{ vitrage_services }}"
notify:
- Restart vitrage-api container
- Restart vitrage-collector container
- Restart vitrage-notifier container
- Restart vitrage-graph container
- Restart vitrage-ml container
@ -98,7 +96,6 @@
with_dict: "{{ vitrage_services }}"
notify:
- Restart vitrage-api container
- Restart vitrage-collector container
- Restart vitrage-graph container
- Restart vitrage-notifier container
- Restart vitrage-ml container
@ -120,7 +117,6 @@
with_dict: "{{ vitrage_services }}"
notify:
- Restart vitrage-api container
- Restart vitrage-collector container
- Restart vitrage-graph container
- Restart vitrage-notifier container
- Restart vitrage-ml container

3
ansible/roles/vitrage/tasks/deploy.yml
View File

@ -6,8 +6,7 @@
when: inventory_hostname in groups['vitrage-api'] or
inventory_hostname in groups['vitrage-ml'] or
inventory_hostname in groups['vitrage-graph'] or
inventory_hostname in groups['vitrage-notifier'] or
inventory_hostname in groups['vitrage-collector']
inventory_hostname in groups['vitrage-notifier']
- include_tasks: clone.yml
when: vitrage_dev_mode | bool

9
ansible/roles/vitrage/tasks/upgrade.yml
View File

@ -3,5 +3,14 @@
- include_tasks: bootstrap_service.yml
# NOTE(kiennt): vitrage-collector are removed in Stein cycle.
# Upgrade to Stein should remove vitrage-collector
# container. This task should be removed in
# T cycle.
- name: Remove vitrage-collector container
kolla_docker:
name: vitrage_collector
action: remove_container
- name: Flush handlers
meta: flush_handlers

24
ansible/roles/vitrage/templates/vitrage-collector.json.j2
View File

@ -1,24 +0,0 @@
{
"command": "vitrage-collector --config-file /etc/vitrage/vitrage.conf",
"config_files": [
{
"source": "{{ container_config_directory }}/vitrage.conf",
"dest": "/etc/vitrage/vitrage.conf",
"owner": "vitrage",
"perm": "0644"
}{% if vitrage_policy_file is defined %},
{
"source": "{{ container_config_directory }}/{{ vitrage_policy_file }}",
"dest": "/etc/vitrage/{{ vitrage_policy_file }}",
"owner": "vitrage",
"perm": "0600"
}{% endif %}
],
"permissions": [
{
"path": "/var/log/kolla/vitrage",
"owner": "vitrage:vitrage",
"recurse": true
}
]
}

1
ansible/site.yml
View File

@ -1170,7 +1170,6 @@
- vitrage-api
- vitrage-graph
- vitrage-notifier
- vitrage-collector
- vitrage-ml
- '&enable_vitrage_True'
serial: '{{ kolla_serial|default("0") }}'

3
tests/templates/inventory.j2
View File

@ -635,9 +635,6 @@ vitrage
[vitrage-graph:children]
vitrage
[vitrage-collector:children]
vitrage
[vitrage-ml:children]
vitrage