openstack
/
instack-undercloud
Code Issues Proposed changes

docker: use ensure_resource 

... so we can have a duplicate resource in puppet-tripleo, and move
these resources to puppet-tripleo only at some point.
Right now, we can't move the resource to puppet-tripleo otherwise we
would have a duplicate resource issue.

Change-Id: I212da7757eceb8445578f2793d55c3d2bf265746
This commit is contained in:
Emilien Macchi 2018-02-12 07:54:03 -08:00
parent 3e702f3bdf
commit f6ab30c2ac
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
elements/puppet-stack-config/puppet-stack-config.pp
View File

@ -546,14 +546,14 @@ augeas { 'lvm.conf':
}
if str2bool(hiera('enable_docker_registry', true)) {
group { 'docker':
ensure => 'present',
}
user { 'docker_user':
name => hiera('tripleo_install_user'),
groups => 'docker',
notify => Service['docker'],
}
ensure_resource('group', 'docker', {
'ensure' => 'present',
})
ensure_resource('user', 'docker_user', {
'name' => hiera('tripleo_install_user'),
'groups' => 'docker',
'notify' => Service['docker'],
})
include ::tripleo::profile::base::docker_registry
}