From: Dimitri Savineau <dsavinea@redhat.com>
Date: Fri, 30 Jul 2021 19:27:52 +0000 (-0400)
Subject: cephadm: set global default container for ingress
X-Git-Tag: v16.2.6~54^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d2012a27d1d9f13b13d8a145c8d75cd5da383030;p=ceph.git

cephadm: set global default container for ingress

This was partially done in b94c8de but only for haproxy in the cephadm
mgr module not in the cephadm binary.
This adds the same change for keepalived container image.
Now both haproxy and keepalived container images are fully qualified
(registry + namespace + image).

Fixes: https://tracker.ceph.com/issues/51973

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit f9eb7d826563ab9b995b4123c03f6d1b89423e01)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index bf67d34eacc5..604635172904 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -53,6 +53,8 @@ DEFAULT_PROMETHEUS_IMAGE = 'docker.io/prom/prometheus:v2.18.1'
 DEFAULT_NODE_EXPORTER_IMAGE = 'docker.io/prom/node-exporter:v0.18.1'
 DEFAULT_GRAFANA_IMAGE = 'docker.io/ceph/ceph-grafana:6.7.4'
 DEFAULT_ALERT_MANAGER_IMAGE = 'docker.io/prom/alertmanager:v0.20.0'
+DEFAULT_HAPROXY_IMAGE = 'docker.io/library/haproxy:2.3'
+DEFAULT_KEEPALIVED_IMAGE = 'docker.io/arcts/keepalived'
 DEFAULT_REGISTRY = 'docker.io'   # normalize unqualified digests to this
 # ------------------------------------------------------------------------------
 
@@ -639,7 +641,7 @@ class HAproxy(object):
     """Defines an HAproxy container"""
     daemon_type = 'haproxy'
     required_files = ['haproxy.cfg']
-    default_image = 'haproxy'
+    default_image = DEFAULT_HAPROXY_IMAGE
 
     def __init__(self,
                  ctx: CephadmContext,
@@ -726,7 +728,7 @@ class Keepalived(object):
     """Defines an Keepalived container"""
     daemon_type = 'keepalived'
     required_files = ['keepalived.conf']
-    default_image = 'arcts/keepalived'
+    default_image = DEFAULT_KEEPALIVED_IMAGE
 
     def __init__(self,
                  ctx: CephadmContext,
diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 87f2fbd0625f..dbf6036830a6 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -97,6 +97,7 @@ DEFAULT_NODE_EXPORTER_IMAGE = 'docker.io/prom/node-exporter:v0.18.1'
 DEFAULT_GRAFANA_IMAGE = 'docker.io/ceph/ceph-grafana:6.7.4'
 DEFAULT_ALERT_MANAGER_IMAGE = 'docker.io/prom/alertmanager:v0.20.0'
 DEFAULT_HAPROXY_IMAGE = 'docker.io/library/haproxy:2.3'
+DEFAULT_KEEPALIVED_IMAGE = 'docker.io/arcts/keepalived'
 # ------------------------------------------------------------------------------
 
 
@@ -214,7 +215,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
         ),
         Option(
             'container_image_keepalived',
-            default='arcts/keepalived',
+            default=DEFAULT_KEEPALIVED_IMAGE,
             desc='Keepalived container image',
         ),
         Option(