diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-20 04:42:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-20 04:42:00 +0000 |
| commit | 35e9ef860fadb71a3015e1e23a265f5ac1354605 (patch) | |
| tree | fb4d0184a8730d6dfdf188f76b8ecc722f56a245 | |
| parent | 76e4c764584fe1ab30291c35c96d3cda7a6be961 (diff) | |
| parent | 3238373ab76a93e8030fdabac957c48437ad8172 (diff) | |
| download | kolla-35e9ef860fadb71a3015e1e23a265f5ac1354605.tar.gz kolla-35e9ef860fadb71a3015e1e23a265f5ac1354605.zip | |
Merge "Revert "check /e/s/s/docker.service in ubuntu""
| -rw-r--r-- | ansible/roles/prechecks/tasks/service_checks.yml | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/ansible/roles/prechecks/tasks/service_checks.yml b/ansible/roles/prechecks/tasks/service_checks.yml index 233b79e09..14aed9904 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 |