openstack/kolla-ansible
Code Issues Proposed changes

Revert "check /e/s/s/docker.service in ubuntu"

Browse Source 
going to merge Swapnil's patch instead of this patch as it relies on real system output rather then looking in files on the filesystem which differ between distributions.

This reverts commit 5c5e903973a9db4541196fbe9fcb99ce66c5cfa4.

Change-Id: I3e474620c90c1f7b2f5e16106f2c18b2058e169c
This commit is contained in:
Steven Dake 2016-04-20 03:24:15 +00:00
parent 5c5e903973
commit 3238373ab7
1 changed files with 2 additions and 12 deletions

14
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