RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

cephadm: add more ContainerDeamonForm methods to the keepalived class

Browse Source 
Add methods customize_{container_args,container_envs} to the keepalived
daemon type class. Use those methods in the get_container function.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
John Mulligan 2023-10-20 18:55:17 -04:00
parent 5bc8b8d80b
commit 3098282c59
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/cephadm/cephadm.py
View File

@ -1756,6 +1756,16 @@ class Keepalived(ContainerDaemonForm):
ctr = get_container(ctx, self.identity)
return to_deployment_container(ctx, ctr)
def customize_container_envs(
self, ctx: CephadmContext, envs: List[str]
) -> None:
envs.extend(self.get_container_envs())
def customize_container_args(
self, ctx: CephadmContext, args: List[str]
) -> None:
args.extend(['--cap-add=NET_ADMIN', '--cap-add=NET_RAW'])
##################################
@ -2905,9 +2915,9 @@ def get_container(
d_args.extend(haproxy.get_daemon_args())
mounts = get_container_mounts(ctx, ident)
elif daemon_type == Keepalived.daemon_type:
name = ident.daemon_name
envs.extend(Keepalived.get_container_envs())
container_args.extend(['--cap-add=NET_ADMIN', '--cap-add=NET_RAW'])
keepalived = Keepalived.create(ctx, ident)
keepalived.customize_container_envs(ctx, envs)
keepalived.customize_container_args(ctx, container_args)
mounts = get_container_mounts(ctx, ident)
elif daemon_type == CephNvmeof.daemon_type:
nvmeof = CephNvmeof.create(ctx, ident)