summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-23 01:20:29 +0000
committerGerrit Code Review <review@openstack.org>2017-08-23 01:20:30 +0000
commitb88a0fb66cb4ff43411ace4111f6f7395c29f5a4 (patch)
tree5b94fc84f6f9a1afcaf2be0b824a189531cf4416
parent26d7023a07c12df582145b9ff68c6bdce60fb31a (diff)
parent55936c49a0acf5fec994321944dfbbe1339cdee2 (diff)
Merge "Accept multiple registries in DockerInsecureRegistryAddress"
-rw-r--r--puppet/services/docker.yaml10
1 files changed, 5 insertions, 5 deletions
diff --git a/puppet/services/docker.yaml b/puppet/services/docker.yaml
index d11ef66a..2cda08eb 100644
--- a/puppet/services/docker.yaml
+++ b/puppet/services/docker.yaml
@@ -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
-