diff options
Diffstat (limited to 'src/cephadm')
| -rwxr-xr-x | src/cephadm/cephadm.py | 4 | ||||
| -rw-r--r-- | src/cephadm/cephadmlib/constants.py | 8 | ||||
| -rw-r--r-- | src/cephadm/cephadmlib/daemons/ceph.py | 4 | ||||
| -rw-r--r-- | src/cephadm/cephadmlib/daemons/smb.py | 1 | ||||
| -rw-r--r-- | src/cephadm/tests/test_deploy.py | 2 |
5 files changed, 11 insertions, 8 deletions
diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 95169358f3a..5deaec55949 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -2892,6 +2892,10 @@ def command_bootstrap(ctx): cli(['config', 'set', 'mgr', 'mgr/cephadm/container_init', str(ctx.container_init), '--force']) + if ctx.no_cgroups_split: + logger.info('Setting mgr/cephadm/cgroups_split to false') + cli(['config', 'set', 'mgr', 'mgr/cephadm/cgroups_split', 'false', '--force']) + if not ctx.skip_dashboard: prepare_dashboard(ctx, uid, gid, cli, wait_for_mgr_restart) diff --git a/src/cephadm/cephadmlib/constants.py b/src/cephadm/cephadmlib/constants.py index b0a989df620..06163d06489 100644 --- a/src/cephadm/cephadmlib/constants.py +++ b/src/cephadm/cephadmlib/constants.py @@ -4,12 +4,12 @@ DEFAULT_IMAGE = 'quay.ceph.io/ceph-ci/ceph:main' DEFAULT_IMAGE_IS_MAIN = True DEFAULT_IMAGE_RELEASE = 'squid' -DEFAULT_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.43.0' +DEFAULT_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.51.0' DEFAULT_LOKI_IMAGE = 'docker.io/grafana/loki:3.0.0' DEFAULT_PROMTAIL_IMAGE = 'docker.io/grafana/promtail:3.0.0' -DEFAULT_NODE_EXPORTER_IMAGE = 'quay.io/prometheus/node-exporter:v1.5.0' -DEFAULT_ALERT_MANAGER_IMAGE = 'quay.io/prometheus/alertmanager:v0.25.0' -DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/grafana:9.4.12' +DEFAULT_NODE_EXPORTER_IMAGE = 'quay.io/prometheus/node-exporter:v1.7.0' +DEFAULT_ALERT_MANAGER_IMAGE = 'quay.io/prometheus/alertmanager:v0.27.0' +DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/grafana:10.4.0' DEFAULT_HAPROXY_IMAGE = 'quay.io/ceph/haproxy:2.3' DEFAULT_KEEPALIVED_IMAGE = 'quay.io/ceph/keepalived:2.2.4' DEFAULT_NVMEOF_IMAGE = 'quay.io/ceph/nvmeof:1.2.1' diff --git a/src/cephadm/cephadmlib/daemons/ceph.py b/src/cephadm/cephadmlib/daemons/ceph.py index 55a92835129..d5e87ad9484 100644 --- a/src/cephadm/cephadmlib/daemons/ceph.py +++ b/src/cephadm/cephadmlib/daemons/ceph.py @@ -436,13 +436,13 @@ def get_ceph_mounts_for_type( mounts[cephadm_binary] = '/usr/sbin/cephadm' mounts[ ceph_folder + '/src/ceph-volume/ceph_volume' - ] = '/usr/lib/python3.6/site-packages/ceph_volume' + ] = '/usr/lib/python3.9/site-packages/ceph_volume' mounts[ ceph_folder + '/src/pybind/mgr' ] = '/usr/share/ceph/mgr' mounts[ ceph_folder + '/src/python-common/ceph' - ] = '/usr/lib/python3.6/site-packages/ceph' + ] = '/usr/lib/python3.9/site-packages/ceph' mounts[ ceph_folder + '/monitoring/ceph-mixin/dashboards_out' ] = '/etc/grafana/dashboards/ceph-dashboard' diff --git a/src/cephadm/cephadmlib/daemons/smb.py b/src/cephadm/cephadmlib/daemons/smb.py index e90329787c7..899ad24c65a 100644 --- a/src/cephadm/cephadmlib/daemons/smb.py +++ b/src/cephadm/cephadmlib/daemons/smb.py @@ -279,7 +279,6 @@ class SMB(ContainerDaemonForm): custom_dns=custom_dns, domain_member=Features.DOMAIN.value in instance_features, clustered=Features.CLUSTERED.value in instance_features, - samba_debug_level=6, smb_port=self.smb_port, ceph_config_entity=ceph_config_entity, vhostname=vhostname, diff --git a/src/cephadm/tests/test_deploy.py b/src/cephadm/tests/test_deploy.py index 0be62ad021e..58f212beff6 100644 --- a/src/cephadm/tests/test_deploy.py +++ b/src/cephadm/tests/test_deploy.py @@ -558,7 +558,7 @@ def test_deploy_smb_container(cephadm_fs, funkypatch): with open(basedir / 'unit.run') as f: runfile_lines = f.read().splitlines() assert 'podman' in runfile_lines[-1] - assert runfile_lines[-1].endswith('quay.io/essembee/samba-server:latest --samba-debug-level=6 run smbd') + assert runfile_lines[-1].endswith('quay.io/essembee/samba-server:latest run smbd') assert f'-v {basedir}/etc-samba-container:/etc/samba/container:z' in runfile_lines[-1] assert f'-v {basedir}/lib-samba:/var/lib/samba:z' in runfile_lines[-1] assert '-e SAMBA_CONTAINER_ID=smb1' in runfile_lines[-1] |