From 4e5e9abcd285c93244308ba581a67938bff15d61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Tue, 19 Oct 2021 16:40:44 +0000
Subject: [PATCH] Fix wrong distro assumptions

It seems some cases were missed in reviews and not fixed by
the previous iterations:
Ifc252ae793e6974356fcdca810b373f362d24ba5
I838e526b930d5276d3ce24f5188262af7eb33280

Change-Id: Id57da1c5024e1efc5810baca8fbe18967cf95a68
---
 ansible/roles/hacluster/defaults/main.yml | 6 +++---
 ansible/roles/masakari/defaults/main.yml  | 2 +-
 ansible/roles/neutron/defaults/main.yml   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ansible/roles/hacluster/defaults/main.yml b/ansible/roles/hacluster/defaults/main.yml
index 6b9d44c55b..730d5eb1e4 100644
--- a/ansible/roles/hacluster/defaults/main.yml
+++ b/ansible/roles/hacluster/defaults/main.yml
@@ -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"
 
diff --git a/ansible/roles/masakari/defaults/main.yml b/ansible/roles/masakari/defaults/main.yml
index 2c38dffdc8..af78e60118 100644
--- a/ansible/roles/masakari/defaults/main.yml
+++ b/ansible/roles/masakari/defaults/main.yml
@@ -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 '' }}"
 
diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml
index 2835b27f52..45e1ec9fc1 100644
--- a/ansible/roles/neutron/defaults/main.yml
+++ b/ansible/roles/neutron/defaults/main.yml
@@ -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 }}"