From d4ea8e686463214a52b1d0004206fbeeb1cda258 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Mon, 8 Apr 2019 12:44:54 +1200 Subject: [PATCH] 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 --- ...container-image-prepare-baremetal-ansible.j2.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml b/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml index 7642ce195b..e667aa0139 100644 --- a/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml +++ b/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml @@ -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}