openstack
/
kolla-ansible
Code Issues Proposed changes

Merge "Fix wrong distro assumptions"

This commit is contained in:
Zuul 2021-10-26 10:03:58 +00:00 committed by Gerrit Code Review
parent 9dee2a92d8 4e5e9abcd2
commit 0ef7c6ed1c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/hacluster/defaults/main.yml
View File

@ -63,19 +63,19 @@ hacluster_pacemaker_remote_dimensions: "{{ default_container_dimensions }}"
hacluster_corosync_default_volumes:
- "{{ node_config_directory }}/hacluster-corosync/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if kolla_base_distro in ['debian', 'ubuntu'] else '' }}"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "hacluster_corosync:/var/lib/corosync"
hacluster_pacemaker_default_volumes:
- "{{ node_config_directory }}/hacluster-pacemaker/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if kolla_base_distro in ['debian', 'ubuntu'] else '' }}"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "hacluster_pacemaker:/var/lib/pacemaker"
hacluster_pacemaker_remote_default_volumes:
- "{{ node_config_directory }}/hacluster-pacemaker-remote/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if kolla_base_distro in ['debian', 'ubuntu'] else '' }}"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "hacluster_pacemaker_remote:/var/lib/pacemaker"

2
ansible/roles/masakari/defaults/main.yml
View File

@ -105,7 +105,7 @@ masakari_instancemonitor_default_volumes:
masakari_hostmonitor_default_volumes:
- "{{ node_config_directory }}/masakari-hostmonitor/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if kolla_base_distro in ['debian', 'ubuntu'] else '' }}"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/masakari-monitors/masakarimonitors:/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages/masakarimonitors' if masakari_dev_mode | bool else '' }}"

2
ansible/roles/neutron/defaults/main.yml
View File

@ -504,7 +504,7 @@ ironic_neutron_agent_default_volumes:
neutron_tls_proxy_default_volumes:
- "{{ node_config_directory }}/neutron-tls-proxy/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if kolla_base_distro in ['debian', 'ubuntu'] else '' }}"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
neutron_extra_volumes: "{{ default_extra_volumes }}"