aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-11-09 03:21:14 +0000
committerGerrit Code Review <review@openstack.org>2017-11-09 03:21:14 +0000
commit9ed6fff5d6bf09cb21e3dfea1efb5e1ce047b014 (patch)
treea364ce06da05853c39c70a73f0cfa277daf477b1 /manifests/profile/base
parent4ccebee06614d2791b2cb82acfa8b5244e8b3942 (diff)
parent59c410e6dd74b2bf4aaa36f36f172fd10481ea7c (diff)
Merge "Unset MountFlags in docker.service systemd directives" into stable/pike
Diffstat (limited to 'manifests/profile/base')
-rw-r--r--manifests/profile/base/docker.pp16
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,