From be27b5cb0429e0370ddb4a83a8b710bc81ec1fd2 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 19 Apr 2017 16:55:54 -0500 Subject: [PATCH] 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 --- manifests/profile/base/docker.pp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/manifests/profile/base/docker.pp b/manifests/profile/base/docker.pp index 4797d866f..d035f6ac2 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'], } }