mgr/cephadm: remove haproxy+keepalived container image from service spec

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 729ebaabd539f1a09c7cfcdc69dff1e2cb409b0d)

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index e92da1f9fbe217b3f56e4c0454c98c5da3497ec2..c458b213cd205c54227404610bfc6ab1d14ca4ec 100644 (file)
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -15,7 +15,7 @@ except ImportError:
 
 from ceph.deployment import inventory
 from ceph.deployment.drive_group import DriveGroupSpec
-from ceph.deployment.service_spec import ServiceSpec, IngressSpec, CustomContainerSpec, PlacementSpec
+from ceph.deployment.service_spec import ServiceSpec, CustomContainerSpec, PlacementSpec
 from ceph.utils import str_to_datetime, datetime_now
 
 import orchestrator
@@ -870,16 +870,6 @@ class CephadmServe:
                         assert daemon_spec.host
                         self._deploy_cephadm_binary(daemon_spec.host)
 
-                if daemon_spec.daemon_type == 'haproxy':
-                    haspec = cast(IngressSpec, self.mgr.spec_store[daemon_spec.service_name].spec)
-                    if haspec.haproxy_container_image:
-                        image = haspec.haproxy_container_image
-
-                if daemon_spec.daemon_type == 'keepalived':
-                    haspec = cast(IngressSpec, self.mgr.spec_store[daemon_spec.service_name].spec)
-                    if haspec.keepalived_container_image:
-                        image = haspec.keepalived_container_image
-
                 # TCP port to open in the host firewall
                 if len(ports) > 0:
                     daemon_spec.extra_args.extend([

diff --git a/src/python-common/ceph/deployment/service_spec.py b/src/python-common/ceph/deployment/service_spec.py
index 3e2915dbb0cbb9855ccb11d246329b0e9ed41d50..3b9caf85aabb54ef3a0473f5832ac3c490eb6422 100644 (file)
--- a/src/python-common/ceph/deployment/service_spec.py
+++ b/src/python-common/ceph/deployment/service_spec.py
@@ -890,8 +890,6 @@ class IngressSpec(ServiceSpec):
                  keepalived_password: Optional[str] = None,
                  virtual_ip: Optional[str] = None,
                  virtual_interface_networks: Optional[List[str]] = [],
-                 haproxy_container_image: Optional[str] = None,
-                 keepalived_container_image: Optional[str] = None,
                  unmanaged: bool = False,
                  ssl: bool = False
                  ):
@@ -914,8 +912,6 @@ class IngressSpec(ServiceSpec):
         self.keepalived_password = keepalived_password
         self.virtual_ip = virtual_ip
         self.virtual_interface_networks = virtual_interface_networks or []
-        self.haproxy_container_image = haproxy_container_image
-        self.keepalived_container_image = keepalived_container_image
         self.unmanaged = unmanaged
         self.ssl = ssl