006ff07185
This is a prerequisite for patchset #745164 This fixes unwanted restarts during copying of certificates. By removing conditional statements from role handlers in #745164, copying certificates caused containers to restart, this is unwanted during the genconfig process. However, if we would remove handler notifiers from copying certificates, the container would never restart, since from #745164, containers will restart only if any of the files specified in config.json change. Certificates are now copied to intermediary location inside of the container, from which the script kolla_copy_cacerts will install them in the trust store. Depends-on: https://review.opendev.org/c/openstack/kolla/+/926882 Change-Id: Ib89048c7e0f250182c4bf57d8c8a1b5478e9b4ab Signed-off-by: Roman Krček <roman.krcek@tietoevry.com>
66 lines
2.1 KiB
Django/Jinja
66 lines
2.1 KiB
Django/Jinja
{
|
|
"command": "/usr/sbin/grafana-server --config=/etc/grafana/grafana.ini",
|
|
"config_files": [
|
|
{
|
|
"source": "{{ container_config_directory }}/grafana.ini",
|
|
"dest": "/etc/grafana/grafana.ini",
|
|
"owner": "grafana",
|
|
"perm": "0600"
|
|
},
|
|
{% if check_extra_conf_grafana is defined %}
|
|
{% for extra_conf in check_extra_conf_grafana.files | map(attribute='path') | map('basename') %}
|
|
{
|
|
"source": "{{ container_config_directory }}/{{ extra_conf }}",
|
|
{% if extra_conf == 'grafana_home_dashboard.json' %}
|
|
"dest": "/usr/share/grafana/public/dashboards/home.json",
|
|
"owner": "root",
|
|
"perm": "0644"
|
|
{% else %}
|
|
"dest": "/etc/grafana/{{ extra_conf }}",
|
|
"owner": "grafana",
|
|
"perm": "0600"
|
|
{% endif %}
|
|
},
|
|
{% endfor %}
|
|
{% endif %}
|
|
{
|
|
"source": "{{ container_config_directory }}/prometheus.yaml",
|
|
"dest": "/etc/grafana/provisioning/datasources/prometheus.yaml",
|
|
"owner": "root",
|
|
"perm": "0644",
|
|
"optional": true
|
|
},
|
|
{
|
|
"source": "{{ container_config_directory }}/provisioning.yaml",
|
|
"dest": "/etc/grafana/provisioning/dashboards/provisioning.yaml",
|
|
"owner": "root",
|
|
"perm": "0644"
|
|
},
|
|
{
|
|
"source": "{{ container_config_directory }}/dashboards/",
|
|
"dest": "/var/lib/grafana/dashboards",
|
|
"owner": "grafana",
|
|
"perm": "0755",
|
|
"optional": true
|
|
}{% if kolla_copy_ca_into_containers | bool %},
|
|
{
|
|
"source": "{{ container_config_directory }}/ca-certificates",
|
|
"dest": "/var/lib/kolla/share/ca-certificates",
|
|
"owner": "root",
|
|
"perm": "0600"
|
|
}{% endif %}
|
|
],
|
|
"permissions": [
|
|
{
|
|
"path": "/var/lib/grafana",
|
|
"owner": "grafana:grafana",
|
|
"recurse": true
|
|
},
|
|
{
|
|
"path": "/var/log/kolla/grafana",
|
|
"owner": "grafana:grafana",
|
|
"recurse": true
|
|
}
|
|
]
|
|
}
|