From: Dan Prince <dprince@redhat.com>
Date: Wed, 19 Apr 2017 21:55:54 +0000 (-0500)
Subject: Ensure /etc/docker/daemon.json
X-Git-Tag: opnfv-6.0.0~228
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=be27b5cb0429e0370ddb4a83a8b710bc81ec1fd2;p=apex-puppet-tripleo.git

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
---

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'],
     }
 
   }