openstack/kolla-ansible
Code Issues Proposed changes

Be less confusing about custom Docker registry

Browse Source 
Docker registry password is, by default, sourced from
passwords.yml file.

Cleans up globals.yml to make it clearer.
Also follows the "present defaults" behaviour of the other vars.

Change-Id: Icc993e82a6a435f948e3d17e410eb14717cb0e2d
This commit is contained in:
Radosław Piliszek 2020-03-28 09:50:39 +01:00
parent 5659177026
commit 06a6b56f14
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
etc/kolla/globals.yml
View File

@ -55,14 +55,16 @@
################
# Docker options
################
# Below is an example of a private repository with authentication. Note the
# Docker registry password can also be set in the passwords.yml file.
#docker_registry: "172.16.0.10:4000"
#docker_namespace: "companyname"
#docker_registry_insecure: "yes"
#docker_registry_username: "sam"
#docker_registry_password: "correcthorsebatterystaple"
# Custom docker registry settings:
#docker_registry:
#docker_registry_insecure: "{{ 'yes' if docker_registry else 'no' }}"
#docker_registry_username:
# docker_registry_password is set in the passwords.yml file.
# Namespace of images:
#docker_namespace: "kolla"
# Docker client timeout in seconds.
#docker_client_timeout: 120