---
- name: Restart grafana container
  vars:
    service_name: "grafana"
    service: "{{ grafana_services[service_name] }}"
    config_json: "{{ grafana_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
    grafana_conf: "{{ grafana_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
    grafana_container: "{{ check_grafana_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
  kolla_docker:
    action: "recreate_or_restart_container"
    common_options: "{{ docker_common_options }}"
    name: "{{ service.container_name }}"
    image: "{{ service.image }}"
    volumes: "{{ service.volumes }}"
  when:
    - action != "config"
    - inventory_hostname in groups[service.group]
    - service.enabled | bool
    - config_json.changed | bool
      or grafana_ini.changed | bool
      or grafana_container.changed | bool

---
- name: Restart grafana container
  vars:
    service_name: "grafana"
    service: "{{ grafana_services[service_name] }}"
    config_json: "{{ grafana_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
    grafana_conf: "{{ grafana_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
    grafana_container: "{{ check_grafana_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
  kolla_docker:
    action: "recreate_or_restart_container"
    common_options: "{{ docker_common_options }}"
    name: "{{ service.container_name }}"
    image: "{{ service.image }}"
    volumes: "{{ service.volumes }}"
  when:
    - action != "config"
    - inventory_hostname in groups[service.group]
    - service.enabled | bool
    - config_json.changed | bool
      or grafana_conf.changed | bool
      or grafana_container.changed | bool

Fix error during Grafana container restart
Fix error during Grafana container restart

grafana_ini file used in test condition doesn't exists,
use grafana_conf file instead.

Change-Id: Id5dca94aed98b0d6cf6c4f841e7380f8b8154416
Closes-Bug: #1673932
