openstack/tripleo-heat-templates
Code Issues Proposed changes

Pass DockerRegistryMirror to prepare

Browse Source 
This is required to fix bug #1800958 so that DockerRegistryMirror is
available to make mirror requests during prepare.

Change-Id: If896c22bf449a3ac91ca363648f84dd5b9aef227
This commit is contained in:
Steve Baker 2018-11-01 14:50:23 +13:00
parent 92ffd5cf75
commit d5728ef0b1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
puppet/services/container-image-prepare.j2.yaml
View File

@ -53,6 +53,11 @@ parameters:
The mechanism drivers for the Neutron tenant network. The mechanism drivers for the Neutron tenant network.
type: comma_delimited_list type: comma_delimited_list
DockerRegistryMirror:
description: Optional. Mirror to use for registry docker.io
default: ''
type: string
{% for role in roles %} {% for role in roles %}
# Parameters generated for {{role.name}} Role # Parameters generated for {{role.name}} Role
{{role.name}}Services: {{role.name}}Services:
@ -97,6 +102,7 @@ outputs:
ContainerImagePrepare: {get_param: ContainerImagePrepare} ContainerImagePrepare: {get_param: ContainerImagePrepare}
DockerInsecureRegistryAddress: {get_param: DockerInsecureRegistryAddress} DockerInsecureRegistryAddress: {get_param: DockerInsecureRegistryAddress}
NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers} NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers}
DockerRegistryMirror: {get_param: DockerRegistryMirror}
{% for role in roles %} {% for role in roles %}
{{role.name}}Services: {get_param: {{role.name}}Services} {{role.name}}Services: {get_param: {{role.name}}Services}
{{role.name}}Count: {get_param: {{role.name}}Count} {{role.name}}Count: {get_param: {{role.name}}Count}

2
puppet/services/docker.yaml
View File

@ -11,7 +11,7 @@ parameters:
type: comma_delimited_list type: comma_delimited_list
default: [] default: []
DockerRegistryMirror: DockerRegistryMirror:
description: Optional. Configure a registry-mirror in the /etc/docker/daemon.json file. description: Optional. Mirror to use for registry docker.io
default: '' default: ''
type: string type: string
EndpointMap: EndpointMap: