Merge "Add seed_deploy_containers_registry_attempt_login"
This commit is contained in:
commit
29f7b3b755
|
@ -123,6 +123,10 @@ seed_users: "{{ users_default }}"
|
|||
#
|
||||
seed_containers: {}
|
||||
|
||||
# Whether to attempt a basic authentication login to a registry when
|
||||
# deploying seed containers
|
||||
seed_deploy_containers_registry_attempt_login: "{{ kolla_docker_registry_username is truthy and kolla_docker_registry_password is truthy }}"
|
||||
|
||||
###############################################################################
|
||||
# Seed node firewalld configuration.
|
||||
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
###############################################################################
|
||||
# Seed node docker regsitry configuration.
|
||||
|
||||
# Whether to attempt a basic authentication login to a registry when
|
||||
# deploying seed containers
|
||||
deploy_containers_registry_attempt_login: "{{ seed_deploy_containers_registry_attempt_login }}"
|
|
@ -73,9 +73,9 @@ custom seed container. In this case, basic authentication login attempts can be
|
|||
disabled by setting
|
||||
|
||||
.. code-block:: yaml
|
||||
:caption: ``kolla.yml``
|
||||
:caption: ``seed.yml``
|
||||
|
||||
deploy_containers_registry_attempt_login: false
|
||||
seed_deploy_containers_registry_attempt_login: false
|
||||
|
||||
Without this setting, the login will fail because the registry has not yet been
|
||||
deployed.
|
||||
|
|
|
@ -106,6 +106,10 @@
|
|||
#
|
||||
#seed_containers:
|
||||
|
||||
# Whether to attempt a basic authentication login to a registry when
|
||||
# deploying seed containers
|
||||
#seed_deploy_containers_registry_attempt_login:
|
||||
|
||||
###############################################################################
|
||||
# Seed node firewalld configuration.
|
||||
|
||||
|
|
Loading…
Reference in New Issue