RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 15:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38881 from ceph/default_images

Browse Source 
mgr/cephadm: Put together default container images references

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
This commit is contained in:
Sebastian Wagner 2021-02-18 12:10:33 +01:00 committed by GitHub
commit 5ce097b48d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/cephadm/cephadm
View File

@ -1,7 +1,14 @@
#!/usr/bin/python3
# Default container images -----------------------------------------------------
DEFAULT_IMAGE = 'docker.io/ceph/daemon-base:latest-master-devel'
DEFAULT_IMAGE_IS_MASTER = True
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 = 'pacific'
DATA_DIR = '/var/lib/ceph'
LOG_DIR = '/var/log/ceph'
@ -225,7 +232,7 @@ class Monitoring(object):
components = {
"prometheus": {
"image": "docker.io/prom/prometheus:v2.18.1",
"image": DEFAULT_PROMETHEUS_IMAGE,
"cpus": '2',
"memory": '4GB',
"args": [
@ -238,7 +245,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": [
@ -246,7 +253,7 @@ class Monitoring(object):
],
},
"grafana": {
"image": "docker.io/ceph/ceph-grafana:6.7.4",
"image": DEFAULT_GRAFANA_IMAGE,
"cpus": "2",
"memory": "4GB",
"args": [],
@ -258,7 +265,7 @@ class Monitoring(object):
],
},
"alertmanager": {
"image": "docker.io/prom/alertmanager:v0.20.0",
"image": DEFAULT_ALERT_MANAGER_IMAGE,
"cpus": "2",
"memory": "2GB",
"args": [

18
src/pybind/mgr/cephadm/module.py
View File

@ -86,6 +86,14 @@ Host *
CEPH_TYPES = set(CEPH_UPGRADE_ORDER)
# Default container images -----------------------------------------------------
DEFAULT_IMAGE = 'docker.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:
@ -182,28 +190,28 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
),
Option(
'container_image_base',
default='docker.io/ceph/ceph',
default=DEFAULT_IMAGE,
desc='Container image name, without the tag',
runtime=True,
),
Option(
'container_image_prometheus',
default='docker.io/prom/prometheus:v2.18.1',
default=DEFAULT_PROMETHEUS_IMAGE,
desc='Prometheus container image',
),
Option(
'container_image_grafana',
default='docker.io/ceph/ceph-grafana:6.7.4',
default=DEFAULT_GRAFANA_IMAGE,
desc='Prometheus container image',
),
Option(
'container_image_alertmanager',
default='docker.io/prom/alertmanager:v0.20.0',
default=DEFAULT_ALERT_MANAGER_IMAGE,
desc='Prometheus container image',
),
Option(
'container_image_node_exporter',
default='docker.io/prom/node-exporter:v0.18.1',
default=DEFAULT_NODE_EXPORTER_IMAGE,
desc='Prometheus container image',
),
Option(