From: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Date: Fri, 12 Feb 2021 13:09:17 +0000 (+0100)
Subject: mgr/cephadm: Put together default container images references
X-Git-Tag: v15.2.15~16^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=75fbe7f034bf113b48b84bff6463b2ae4b0b0f33;p=ceph.git

mgr/cephadm: Put together default container images references

Placed all in the same location in order to make easy downstream modifications
and future changes

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit ce246479443a64b292c7cff2a662161c8a598e09)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 76e65349b6c5..dda12a62462e 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1,7 +1,14 @@
 #!/usr/bin/python3
 
-DEFAULT_IMAGE='quay.io/ceph/ceph:v15'
-DEFAULT_IMAGE_IS_MASTER=False
+# Default container images -----------------------------------------------------
+DEFAULT_IMAGE = 'quay.io/ceph/ceph:v15'
+DEFAULT_IMAGE_IS_MASTER = False
+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"
+# ------------------------------------------------------------------------------
+
 LATEST_STABLE_RELEASE = 'octopus'
 DATA_DIR = '/var/lib/ceph'
 LOG_DIR = '/var/log/ceph'
@@ -163,7 +170,7 @@ class Monitoring(object):
 
     components = {
         "prometheus": {
-            "image": "docker.io/prom/prometheus:v2.18.1",
+            "image": DEFAULT_PROMETHEUS_IMAGE,
             "cpus": '2',
             "memory": '4GB',
             "args": [
@@ -176,7 +183,7 @@ class Monitoring(object):
             ],
         },
         "node-exporter": {
-            "image": "docker.io/prom/node-exporter:v0.18.1",
+            "image": DEFAULT_NODE_EXPORTER_IMAGE,
             "cpus": "1",
             "memory": "1GB",
             "args": [
@@ -184,7 +191,7 @@ class Monitoring(object):
             ],
         },
         "grafana": {
-            "image": "docker.io/ceph/ceph-grafana:6.7.4",
+            "image": DEFAULT_GRAFANA_IMAGE,
             "cpus": "2",
             "memory": "4GB",
             "args": [],
@@ -196,7 +203,7 @@ class Monitoring(object):
             ],
         },
         "alertmanager": {
-            "image": "docker.io/prom/alertmanager:v0.20.0",
+            "image": DEFAULT_ALERT_MANAGER_IMAGE,
             "cpus": "2",
             "memory": "2GB",
             "args": [
diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index f0e827e81d43..54431ace266c 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -90,6 +90,14 @@ Host *
 
 CEPH_TYPES = set(CEPH_UPGRADE_ORDER)
 
+# Default container images -----------------------------------------------------
+DEFAULT_IMAGE = 'quay.io/ceph/ceph'
+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'
+# ------------------------------------------------------------------------------
+
 
 class CephadmCompletion(orchestrator.Completion[T]):
     def evaluate(self) -> None:
@@ -162,28 +170,28 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
         },
         {
             'name': 'container_image_base',
-            'default': 'quay.io/ceph/ceph',
+            'default': DEFAULT_IMAGE,
             'desc': 'Container image name, without the tag',
             'runtime': True,
         },
         {
             'name': 'container_image_prometheus',
-            'default': 'docker.io/prom/prometheus:v2.18.1',
+            'default': DEFAULT_PROMETHEUS_IMAGE,
             'desc': 'Prometheus container image',
         },
         {
             'name': 'container_image_grafana',
-            'default': 'docker.io/ceph/ceph-grafana:6.7.4',
+            'default': DEFAULT_GRAFANA_IMAGE,
             'desc': 'Prometheus container image',
         },
         {
             'name': 'container_image_alertmanager',
-            'default': 'docker.io/prom/alertmanager:v0.20.0',
+            'default': DEFAULT_ALERT_MANAGER_IMAGE,
             'desc': 'Prometheus container image',
         },
         {
             'name': 'container_image_node_exporter',
-            'default': 'docker.io/prom/node-exporter:v0.18.1',
+            'default': DEFAULT_NODE_EXPORTER_IMAGE,
             'desc': 'Prometheus container image',
         },
         {