Merge "Add seed_deploy_containers_registry_attempt_login" into stable…

…/yoga
stackhpc · Nov 6, 2023 · ad260ae · ad260ae
2 parents 074e06e + 1862781
commit ad260ae
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/ansible/group_vars/all/seed b/ansible/group_vars/all/seed
@@ -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.
 

diff --git a/ansible/group_vars/seed/docker-registry b/ansible/group_vars/seed/docker-registry
@@ -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 }}"
diff --git a/doc/source/configuration/reference/seed-custom-containers.rst b/doc/source/configuration/reference/seed-custom-containers.rst
@@ -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.

diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml
@@ -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.