From 1476b9a68bc7bda524ea6ec94d701b3aaeebf68f Mon Sep 17 00:00:00 2001
From: Alex-Welsh <alex@stackhpc.com>
Date: Mon, 16 Oct 2023 17:15:05 +0100
Subject: [PATCH] Add seed_deploy_containers_registry_attempt_login

Follow on to Ie17ef9ce1147cbaec2e42db932c7d59293b49b1b

Adds seed_deploy_containers_registry_attempt_login variable to seed.yml,
which acts as a redirection of deploy_containers_registry_attempt_login
so that the variable is more descriptive, declared in a better location,
and extensible to other groups

Change-Id: I86d8f13062ff8e664919cd5d63bc17bdafb32e0c
---
 ansible/inventory/group_vars/all/seed                      | 4 ++++
 ansible/inventory/group_vars/seed/docker-registry          | 7 +++++++
 .../configuration/reference/seed-custom-containers.rst     | 4 ++--
 etc/kayobe/seed.yml                                        | 4 ++++
 4 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 ansible/inventory/group_vars/seed/docker-registry

diff --git a/ansible/inventory/group_vars/all/seed b/ansible/inventory/group_vars/all/seed
index cd3d9f2ed..14b67020b 100644
--- a/ansible/inventory/group_vars/all/seed
+++ b/ansible/inventory/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/inventory/group_vars/seed/docker-registry b/ansible/inventory/group_vars/seed/docker-registry
new file mode 100644
index 000000000..f439501ec
--- /dev/null
+++ b/ansible/inventory/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
index 8c9738ff0..5b3e03cdd 100644
--- 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
index f7cacab42..bc86fa627 100644
--- 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.