docker: configure group/user for deployment_user

Configure the deployment_user to be part of docker group, required for
openstack container commands.

Change-Id: Ifd1bec1262dfbd213810bb2b4d561f47bf010e69
This commit is contained in:
Emilien Macchi 2018-02-13 21:10:23 -08:00
parent 493394c089
commit f81ee4f865
2 changed files with 27 additions and 0 deletions

View File

@ -54,6 +54,10 @@
# Boolean. Value to configure docker daemon's debug configuration.
# Defaults to false
#
# [*deployment_user*]
# String. Value to configure the deployment user.
# Defaults to hiera('deployment_user', undef)
#
# DEPRECATED PARAMETERS
#
# [*insecure_registry_address*]
@ -80,6 +84,7 @@ class tripleo::profile::base::docker (
$storage_options = '-s overlay2',
$step = Integer(hiera('step')),
$debug = false,
$deployment_user = hiera('deployment_user', undef),
# DEPRECATED PARAMETERS
$insecure_registry_address = undef,
$docker_namespace = undef,
@ -230,5 +235,22 @@ class tripleo::profile::base::docker (
require => Package['docker'],
}
if $deployment_user {
ensure_resource('group', 'docker', {
'ensure' => 'present',
})
ensure_resource('user', $deployment_user, {
'name' => $deployment_user,
'groups' => 'docker',
# We need to add the user into docker group
# before docker starts otherwise the user won't
# be able to use Docker CLI.
# See background:
# https://review.openstack.org/#/c/390549/3/elements/puppet-stack-config/puppet-stack-config.pp
# https://docs.docker.com/install/linux/linux-postinstall/#manage-docker-as-a-non-root-user
'notify' => Service['docker'],
})
}
}
}

View File

@ -0,0 +1,5 @@
---
features:
- |
Configure the deployment_user to be part of docker group, required for
openstack container commands.