diff options
| author |   Oliver Walsh <owalsh@redhat.com> | 2017-11-07 00:24:59 +0000 |
|---|---|---|
| committer | Oliver Walsh <owalsh@redhat.com> | 2017-11-08 14:40:24 +0000 |
| commit | 59c410e6dd74b2bf4aaa36f36f172fd10481ea7c (patch) | |
| tree | bd1544cd9a0b6ea27332ef190bd2fac91e04860a /manifests | |
| parent | dd17e35242b027c3a5ebd23222d0abcac706806d (diff) | |
Unset MountFlags in docker.service systemd directives
Required to allow bind propegation options to be set on individual bind-mounts.
See https://github.com/moby/moby/issues/19625.
Also https://access.redhat.com/articles/2938171 for rational for using this
option in RHEL/CentOS 7.3.
Change-Id: I8a63c044e15d7ca0f54654e9fc9c5d878461aa25
Related-bug: 1730533
(cherry picked from commit 2366b5b2fe3bc97d11aa9c3a65660ff78a6dc6f7)
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/docker.pp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/manifests/profile/base/docker.pp b/manifests/profile/base/docker.pp index 73731ad..d3f6fe7 100644 --- a/manifests/profile/base/docker.pp +++ b/manifests/profile/base/docker.pp @@ -83,6 +83,22 @@ class tripleo::profile::base::docker ( ensure => installed, } + $docker_unit_override="[Service]\nMountFlags=\n" + + file {'/etc/systemd/system/docker.service.d': + ensure => directory, + require => Package['docker'], + } + -> file {'/etc/systemd/system/docker.service.d/99-unset-mountflags.conf': + content => $docker_unit_override, + } + ~> exec { 'systemd daemon-reload': + command => 'systemctl daemon-reload', + path => ['/usr/bin', '/usr/sbin'], + refreshonly => true, + notify => Service['docker'] + } + service { 'docker': ensure => 'running', enable => true, |