diff options
| author |   Dan Prince <dprince@redhat.com> | 2017-04-19 16:55:54 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2017-04-19 17:20:27 -0500 |
| commit | be27b5cb0429e0370ddb4a83a8b710bc81ec1fd2 (patch) | |
| tree | b712a5d0d43b1ce61259f5a533e97dcf0aca8e40 /manifests | |
| parent | d5471212123fee21cc44175362cf36e9449a2484 (diff) | |
Ensure /etc/docker/daemon.json
A recent Centos docker packaging change removed the default
/etc/docker/daemon.json file. As such we need to create an empty
json file if none exists before running Augeas to configure
the settings.
Change-Id: Ibfe04b468639002f55da7bb65d2606f730c700b7
Closes-bug: #1684297
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/docker.pp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/manifests/profile/base/docker.pp b/manifests/profile/base/docker.pp index 4797d86..d035f6a 100644 --- a/manifests/profile/base/docker.pp +++ b/manifests/profile/base/docker.pp @@ -79,12 +79,21 @@ class tripleo::profile::base::docker ( $mirror_changes = [ 'rm dict/entry[. = "registry-mirrors"]', ] } + file { '/etc/docker/daemon.json': + ensure => 'present', + content => '{}', + mode => '0644', + replace => false, + require => Package['docker'] + } + augeas { 'docker-daemon.json': lens => 'Json.lns', incl => '/etc/docker/daemon.json', changes => $mirror_changes, subscribe => Package['docker'], notify => Service['docker'], + require => File['/etc/docker/daemon.json'], } } |