146b00efa7
Previously we mounted /etc/timezone if the kolla_base_distro is debian or ubuntu. This would fail prechecks if debian or ubuntu images were deployed on CentOS. While this is not a supported combination, for correctness we should fix the condition to reference the host OS rather than the container OS, since that is where the /etc/timezone file is located. Change-Id: Ifc252ae793e6974356fcdca810b373f362d24ba5 Closes-Bug: #1882553
38 lines
1.3 KiB
YAML
38 lines
1.3 KiB
YAML
---
|
|
project_name: "collectd"
|
|
|
|
collectd_services:
|
|
collectd:
|
|
container_name: collectd
|
|
group: collectd
|
|
enabled: true
|
|
image: "{{ collectd_image_full }}"
|
|
privileged: True
|
|
volumes: "{{ collectd_default_volumes + collectd_extra_volumes }}"
|
|
dimensions: "{{ collectd_dimensions }}"
|
|
|
|
####################
|
|
# Docker
|
|
####################
|
|
collectd_install_type: "{{ kolla_install_type }}"
|
|
collectd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ collectd_install_type }}-collectd"
|
|
collectd_tag: "{{ openstack_tag }}"
|
|
collectd_image_full: "{{ collectd_image }}:{{ collectd_tag }}"
|
|
|
|
collectd_dimensions: "{{ default_container_dimensions }}"
|
|
|
|
collectd_default_volumes:
|
|
- "{{ node_config_directory }}/collectd/:{{ container_config_directory }}/:ro"
|
|
- "{{ node_config_directory }}/collectd/collectd.conf.d/:/etc/collectd/collectd.conf.d/"
|
|
- "/etc/localtime:/etc/localtime:ro"
|
|
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_os_family == 'Debian' else '' }}"
|
|
- "kolla_logs:/var/log/kolla/"
|
|
- "/sys/:/sys/:ro"
|
|
- "/dev/:/dev/:ro"
|
|
collectd_extra_volumes: "{{ default_extra_volumes }}"
|
|
|
|
####################
|
|
# OpenStack
|
|
####################
|
|
collectd_logging_debug: "{{ openstack_logging_debug }}"
|