openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Add parameter ContainerImageRegistryCredentials 

This defines the interface to specify the authentication credentials
for container image registries which require them. It is separate from
the ContainerImagePrepare parameter so that the credentials only need
to be stated once, and so the secrets can be flagged as hidden
parameters.

Change-Id: I3b2743cd48b2083468acb83a4ddeb98a93d795a2
Partial-Bug: #1823579
This commit is contained in:
Steve Baker 2019-04-08 12:44:54 +12:00
parent 0ac955eb87
commit d4ea8e6864
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml
View File

@ -61,6 +61,17 @@ parameters:
default: false
description: Whether or not we want to activate --debug in tripleo container image prepare.
type: boolean
ContainerImageRegistryCredentials:
type: json
hidden: true
default: {}
description: |
Mapping of image registry hosts to login credentials. Must be in the following example format
docker.io:
username: pa55word
'192.0.2.1:8787':
registry_username: password
{% for role in roles %}
# Parameters generated for {{role.name}} Role
@ -110,6 +121,7 @@ outputs:
DockerInsecureRegistryAddress: {get_param: DockerInsecureRegistryAddress}
NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers}
DockerRegistryMirror: {get_param: DockerRegistryMirror}
ContainerImageRegistryCredentials: {get_param: ContainerImageRegistryCredentials}
{% for role in roles %}
{{role.name}}Services: {get_param: {{role.name}}Services}
{{role.name}}Count: {get_param: {{role.name}}Count}