Merge "Accept multiple registries in DockerInsecureRegistryAddress"
This commit is contained in:
commit
b88a0fb66c
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user