From 3238373ab76a93e8030fdabac957c48437ad8172 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Wed, 20 Apr 2016 03:24:15 +0000
Subject: [PATCH] Revert "check /e/s/s/docker.service in ubuntu"
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
---
ansible/roles/prechecks/tasks/service_checks.yml | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
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