openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "[queens only] Add registry login support" into stable/queens

This commit is contained in:
Zuul 2019-08-20 05:17:06 +00:00 committed by Gerrit Code Review
parent 25ccb906a6 e3fae2b04a
commit b123931159
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,6 +62,11 @@
# String. Value to configure the deployment user. # String. Value to configure the deployment user.
# Defaults to hiera('deployment_user', undef) # Defaults to hiera('deployment_user', undef)
# #
# [*registry_credentials*]
# Hash. A hash of registry credentials used with docker login. This should
# be in { 'registry_host' => { 'username' => 'password' } } format.
# Defaults to {}
#
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
# #
# [*insecure_registry_address*] # [*insecure_registry_address*]
@ -79,17 +84,18 @@
# is enabled (defaults to false) # is enabled (defaults to false)
# #
class tripleo::profile::base::docker ( class tripleo::profile::base::docker (
$insecure_registries = undef, $insecure_registries = undef,
$registry_mirror = false, $registry_mirror = false,
$docker_options = '--log-driver=journald --signature-verification=false --iptables=false --live-restore', $docker_options = '--log-driver=journald --signature-verification=false --iptables=false --live-restore',
$additional_sockets = undef, $additional_sockets = undef,
$configure_network = false, $configure_network = false,
$network_options = '', $network_options = '',
$configure_storage = true, $configure_storage = true,
$storage_options = '-s overlay2', $storage_options = '-s overlay2',
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$debug = false, $debug = false,
$deployment_user = hiera('deployment_user', undef), $deployment_user = hiera('deployment_user', undef),
$registry_credentials = {},
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$insecure_registry_address = undef, $insecure_registry_address = undef,
$docker_namespace = undef, $docker_namespace = undef,
@ -283,6 +289,22 @@ class tripleo::profile::base::docker (
'notify' => Service['docker'], 'notify' => Service['docker'],
}) })
} }
}
if $step == 1 {
$registry_credentials.each |$host, $cred| {
$cred.each |$user, $pass| {
exec { "Login to ${host} as ${user}":
path => ['/bin', '/usr/bin'],
command => 'docker login -u $USER -p $PASS $HOST',
environment => [
"USER=${user}",
"PASS=${pass}",
"HOST=${host}",
],
require => Service['docker'],
}
}
}
} }
} }