diff options
| author | Adam King <47704447+adk3798@users.noreply.github.com> | 2023-07-11 23:04:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-11 23:04:35 +0200 |
| commit | bd1a94f190c24408a69d0463fd3022e6a205bdc4 (patch) | |
| tree | bc7725810f8b4a69b3f4116380ee13b3b8057c9b /src/python-common | |
| parent | Merge pull request #51880 from adk3798/host-unreachable-func (diff) | |
| parent | Cephadm: Add first_virtual_router_id to generated yaml on test (diff) | |
| download | ceph-bd1a94f190c24408a69d0463fd3022e6a205bdc4.tar.xz ceph-bd1a94f190c24408a69d0463fd3022e6a205bdc4.zip | |
Merge pull request #52020 from Dazul/cephadm-keepalived-choose-unicast-or-interface
cephadm: Split multicast interface and unicast_ip in keepalived.conf
Reviewed-by: Adam King <adking@redhat.com>
Diffstat (limited to 'src/python-common')
| -rw-r--r-- | src/python-common/ceph/deployment/service_spec.py | 6 | ||||
| -rw-r--r-- | src/python-common/ceph/tests/test_service_spec.py | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/python-common/ceph/deployment/service_spec.py b/src/python-common/ceph/deployment/service_spec.py index 2f981ede5fb..6f3697f972d 100644 --- a/src/python-common/ceph/deployment/service_spec.py +++ b/src/python-common/ceph/deployment/service_spec.py @@ -1200,6 +1200,9 @@ class IngressSpec(ServiceSpec): virtual_ip: Optional[str] = None, virtual_ips_list: Optional[List[str]] = None, virtual_interface_networks: Optional[List[str]] = [], + use_keepalived_multicast: Optional[bool] = False, + vrrp_interface_network: Optional[str] = None, + first_virtual_router_id: Optional[int] = 50, unmanaged: bool = False, ssl: bool = False, keepalive_only: bool = False, @@ -1232,6 +1235,9 @@ class IngressSpec(ServiceSpec): self.virtual_ip = virtual_ip self.virtual_ips_list = virtual_ips_list self.virtual_interface_networks = virtual_interface_networks or [] + self.use_keepalived_multicast = use_keepalived_multicast + self.vrrp_interface_network = vrrp_interface_network + self.first_virtual_router_id = first_virtual_router_id self.unmanaged = unmanaged self.ssl = ssl self.keepalive_only = keepalive_only diff --git a/src/python-common/ceph/tests/test_service_spec.py b/src/python-common/ceph/tests/test_service_spec.py index 3f5ed0137b6..502057f5ca3 100644 --- a/src/python-common/ceph/tests/test_service_spec.py +++ b/src/python-common/ceph/tests/test_service_spec.py @@ -375,6 +375,7 @@ placement: - host3 spec: backend_service: rgw.foo + first_virtual_router_id: 50 frontend_port: 8080 monitor_port: 8081 virtual_ip: 192.168.20.1/24 |