summaryrefslogtreecommitdiffstats
path: root/puppet/services/docker.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-21 15:20:52 +0000
committerGerrit Code Review <review@openstack.org>2017-07-21 15:20:52 +0000
commit9f1fbcb40a030d40b3241b6684fd554e12732dd1 (patch)
treef649cd1bda429b592b1186a7fd754e2ece647bb7 /puppet/services/docker.yaml
parentfdd4352375c24c189d028f34cc66b3b1f2d474ee (diff)
parent8a305da32aaff257e01691e7d0f61abb4ed75bf3 (diff)
Merge "Remove DockerNamespace references"
Diffstat (limited to 'puppet/services/docker.yaml')
-rw-r--r--puppet/services/docker.yaml19
1 files changed, 11 insertions, 8 deletions
diff --git a/puppet/services/docker.yaml b/puppet/services/docker.yaml
index d92b666b..d11ef66a 100644
--- a/puppet/services/docker.yaml
+++ b/puppet/services/docker.yaml
@@ -4,13 +4,11 @@ description: >
Configures docker on the host
parameters:
- DockerNamespace:
- description: namespace
- default: tripleoupstream
+ DockerInsecureRegistryAddress:
+ description: Optional. The IP Address and Port of an insecure docker
+ namespace that will be configured in /etc/sysconfig/docker.
type: string
- DockerNamespaceIsRegistry:
- type: boolean
- default: false
+ default: ''
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@ -38,14 +36,19 @@ parameters:
description: Parameters specific to the role
type: json
+conditions:
+ insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, '']}
+
outputs:
role_data:
description: Role data for the docker service
value:
service_name: docker
config_settings:
- tripleo::profile::base::docker::docker_namespace: {get_param: DockerNamespace}
- tripleo::profile::base::docker::insecure_registry: {get_param: DockerNamespaceIsRegistry}
+ if:
+ - insecure_registry_is_empty
+ - {}
+ - tripleo::profile::base::docker::insecure_registry_address: {get_param: DockerInsecureRegistryAddress}
step_config: |
include ::tripleo::profile::base::docker
upgrade_tasks: