From 146443507237e3ea83d1520f12ab0c32c326ffdc Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Wed, 9 Jun 2021 17:57:52 +0200
Subject: [PATCH] add enabled flag for docker_mirror setting
---
ansible/group_vars/all/settings.yml.example | 3 ++-
ansible/roles/pre-configure/tasks/main.yml | 2 +-
openappstack/cluster.py | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ansible/group_vars/all/settings.yml.example b/ansible/group_vars/all/settings.yml.example
index e52ae2842..6e6eb534d 100644
--- a/ansible/group_vars/all/settings.yml.example
+++ b/ansible/group_vars/all/settings.yml.example
@@ -12,7 +12,8 @@ admin_email: "admin@example.com"
acme_staging: false
# It is possible to add a docker mirror that serves images from docker.io.
-docker_mirror: {}
+docker_mirror:
+ enabled: false
# endpoint: URL of docker mirror
# username: username for auth
# password: password for auth
diff --git a/ansible/roles/pre-configure/tasks/main.yml b/ansible/roles/pre-configure/tasks/main.yml
index b28b114c4..53a953ae8 100644
--- a/ansible/roles/pre-configure/tasks/main.yml
+++ b/ansible/roles/pre-configure/tasks/main.yml
@@ -116,4 +116,4 @@
src: registries.yaml
dest: /etc/rancher/k3s/registries.yaml
mode: '0740'
- when: docker_mirror is not empty
+ when: docker_mirror.enabled
diff --git a/openappstack/cluster.py b/openappstack/cluster.py
index 1472913b2..2db0c6687 100644
--- a/openappstack/cluster.py
+++ b/openappstack/cluster.py
@@ -177,6 +177,7 @@ class Cluster:
if self.docker_mirror_endpoint \
and self.docker_mirror_username \
and self.docker_mirror_password:
+ settings['docker_mirror']['enabled'] = True
settings['docker_mirror']['endpoint'] = self.docker_mirror_endpoint
settings['docker_mirror']['username'] = self.docker_mirror_username
settings['docker_mirror']['password'] = self.docker_mirror_password
--
GitLab