openstack
/
puppet-tripleo
Code Issues Proposed changes

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
This commit is contained in:
Dan Prince 2017-04-19 16:55:54 -05:00
parent d547121212
commit be27b5cb04
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/profile/base/docker.pp
View File

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