Accept multiple registries in DockerInsecureRegistryAddress

We allow using multiple registries (e.g. for OpenStack vs. Ceph
container images). We should allow it also in the insecure registry
configuration.

Change-Id: Icf4a51baf2a230b3fa0d5ced0e9cd1983cd93fb0
Closes-Bug: #1709310
Depends-On: I5cddd20a123a85516577bde1b793a30d43171285
This commit is contained in:
Jiri Stransky 2017-08-10 18:21:12 +02:00
parent a454ff5acb
commit 55936c49a0
1 changed files with 5 additions and 5 deletions

View File

@ -7,8 +7,9 @@ parameters:
DockerInsecureRegistryAddress:
description: Optional. The IP Address and Port of an insecure docker
namespace that will be configured in /etc/sysconfig/docker.
type: string
default: ''
The value can be multiple addresses separated by commas.
type: comma_delimited_list
default: []
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@ -37,7 +38,7 @@ parameters:
type: json
conditions:
insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, '']}
insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, []]}
outputs:
role_data:
@ -48,11 +49,10 @@ outputs:
if:
- insecure_registry_is_empty
- {}
- tripleo::profile::base::docker::insecure_registry_address: {get_param: DockerInsecureRegistryAddress}
- tripleo::profile::base::docker::insecure_registries: {get_param: DockerInsecureRegistryAddress}
step_config: |
include ::tripleo::profile::base::docker
upgrade_tasks:
- name: Install docker packages on upgrade if missing
tags: step3
yum: name=docker state=latest