openstack/kolla-ansible
Code Issues Proposed changes

Fix Neutron precheck to not fail with newer Docker

Browse Source 
With newer Docker versions `systemctl show docker` returns:

  MountFlags=shared

Instead of:

  MountFlags=1048576

This fix accepts either value as valid to ensure the check is not
erroneously failing.

Closes-Bug: #1791365

Change-Id: I2bd626466d6a0e189e0d85877b2be8f2b4bb37f4
This commit is contained in:
Gary Perkins 2019-03-08 18:28:57 +00:00
parent f637d139d2
commit 958efcef73
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ansible/roles/neutron/tasks/precheck.yml
View File

@ -27,11 +27,14 @@
# When MountFlags is set to shared, a signal bit configured on 20th bit of a number # When MountFlags is set to shared, a signal bit configured on 20th bit of a number
# We need to check the 20th bit. 2^20 = 1048576. So we are validating against it. # We need to check the 20th bit. 2^20 = 1048576. So we are validating against it.
# In some systems MountFlags on the Docker service is set to 'shared', whereas
# in others it's set to the decimal value of the 20th bit. This now checks for both
# values. Either '1048576' or 'shared' will pass the precheck.
- name: Checking if 'MountFlags' for docker service is set to 'shared' - name: Checking if 'MountFlags' for docker service is set to 'shared'
command: systemctl show docker command: systemctl show docker
register: result register: result
changed_when: false changed_when: false
failed_when: result.stdout.find('MountFlags=1048576') == -1 failed_when: result.stdout.find('MountFlags=1048576') == -1 and result.stdout.find('MountFlags=shared') == -1
when: when:
- (inventory_hostname in groups['neutron-dhcp-agent'] - (inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']