python-common/service_spec: add kmip fields to NFS spec

The KMIP block will take the form

KMIP {
        HOST {
                 addr = kmip-host-1.example.com;
        }
        cert = /etc/ganesha/kmip/cert.pem;
        key = /etc/ganesha/kmip/key.pem;
        ca = /etc/ganesha/kmip/ca.pem;
}

this commit adds the 4 fields that will populate the block

Signed-off-by: Adam King <[email protected]>
(cherry picked from commit 5301120)

Conflicts:
	src/python-common/ceph/deployment/service_spec.py

Resolves: rhbz#2373703

Author: adk3798

src/python-common/ceph/deployment/service_spec.py

@@ -1,3 +1,5 @@
+
+
 import fnmatch
 import os
 import re
@@ -1221,6 +1223,10 @@ def __init__(self,
                  idmap_conf: Optional[Dict[str, Dict[str, str]]] = None,
                  custom_configs: Optional[List[CustomConfig]] = None,
                  enable_virtual_server: bool = False,
+                 kmip_cert: Optional[str] = None,
+                 kmip_key: Optional[str] = None,
+                 kmip_ca_cert: Optional[str] = None,
+                 kmip_host_list: Optional[List[str]] = None,
                  ):
         assert service_type == 'nfs'
         super(NFSServiceSpec, self).__init__(
@@ -1245,6 +1251,10 @@ def __init__(self,
         self.idmap_conf = idmap_conf
         self.enable_nlm = enable_nlm
         self.enable_virtual_server = enable_virtual_server
+        self.kmip_cert = kmip_cert
+        self.kmip_key = kmip_key
+        self.kmip_ca_cert = kmip_ca_cert
+        self.kmip_host_list = kmip_host_list
 
     def get_port_start(self) -> List[int]:
         if self.port:
@@ -1262,6 +1272,18 @@ def validate(self) -> None:
             raise SpecValidationError("Invalid NFS spec: Cannot set virtual_ip and "
                                       f"{'ip_addrs' if self.ip_addrs else 'networks'} fields")
 
+        kmip_field_names = [
+            'kmip_cert',
+            'kmip_key',
+            'kmip_ca_cert',
+            'kmip_host_list'
+        ]
+        kmip_fields = [getattr(self, kmip_field) for kmip_field in kmip_field_names]
+        if any(kmip_fields) and not all(kmip_fields):
+            raise SpecValidationError(
+                f'Either none or all of {kmip_field_names} attrbutes must be set'
+            )
+
 
 yaml.add_representer(NFSServiceSpec, ServiceSpec.yaml_representer)