diff --git a/ansible/roles/prechecks/tasks/service_checks.yml b/ansible/roles/prechecks/tasks/service_checks.yml index 233b79e09a..14aed9904d 100644 --- a/ansible/roles/prechecks/tasks/service_checks.yml +++ b/ansible/roles/prechecks/tasks/service_checks.yml @@ -12,7 +12,7 @@ failed_when: result | failed or (result.stdout | from_yaml).Server.Version | regex_replace('(\\d+\\.\\d+\\.\\d+).*', '\\1') | version_compare(docker_version_min, '<') -- name: Checking if 'MountFlags' in /lib/systemd/system/docker.service is set to 'shared' in RedHat family +- name: Checking if 'MountFlags' in /lib/systemd/system/docker.service is set to 'shared' command: cat /lib/systemd/system/docker.service register: result changed_when: false @@ -22,17 +22,7 @@ or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent']) - ansible_os_family == 'RedHat' - -- name: Checking if 'MountFlags' in /etc/systemd/system/docker.service is set to 'shared' in Ubuntu - command: cat /etc/systemd/system/docker.service - register: result - changed_when: false - failed_when: result.stdout.find('MountFlags=shared') == -1 - when: - - (inventory_hostname in groups['neutron-dhcp-agent'] - or inventory_hostname in groups['neutron-l3-agent'] - or inventory_hostname in groups['neutron-metadata-agent']) - - ansible_distribution == 'Ubuntu' and ansible_distribution_version > '14.04' + or (ansible_distribution == 'Ubuntu' and ansible_distribution_version > '14.04') - name: Checking if '/run' mount flag is set to 'shared' command: awk '$5 == "/run" {print $7}' /proc/self/mountinfo