From f6ab30c2ac3edbe8a3eb6cf0a2532de8a6015b3a Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 12 Feb 2018 07:54:03 -0800 Subject: [PATCH] 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 --- .../puppet-stack-config/puppet-stack-config.pp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp index 0727b99ec..190318bea 100644 --- a/elements/puppet-stack-config/puppet-stack-config.pp +++ b/elements/puppet-stack-config/puppet-stack-config.pp @@ -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 }