From: Sage Weil <sage@redhat.com>
Date: Mon, 16 Mar 2020 17:54:27 +0000 (-0400)
Subject: python-common/ceph/deployment/service_spec: add ssl to RGWSpec
X-Git-Tag: v15.2.0~3^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf06f6cc1929355f8e1e6dfd00d9ed738e3406e9;p=ceph.git

python-common/ceph/deployment/service_spec: add ssl to RGWSpec

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/python-common/ceph/deployment/service_spec.py b/src/python-common/ceph/deployment/service_spec.py
index ae19d739fd28..b7344c463ad3 100644
--- a/src/python-common/ceph/deployment/service_spec.py
+++ b/src/python-common/ceph/deployment/service_spec.py
@@ -419,6 +419,7 @@ class RGWSpec(ServiceSpec):
                  service_type='rgw',
                  rgw_frontend_port=None,  # type: Optional[int]
                  unmanaged=False,  # type: bool
+                 ssl=False,   # type: bool
                  ):
         assert service_type == 'rgw'
         if service_id:
@@ -432,3 +433,12 @@ class RGWSpec(ServiceSpec):
         self.rgw_realm = rgw_realm
         self.rgw_zone = rgw_zone
         self.rgw_frontend_port = rgw_frontend_port
+        self.ssl = ssl
+
+    def get_port(self):
+        if self.rgw_frontend_port:
+            return self.rgw_frontend_port
+        if self.ssl:
+            return 443
+        else:
+            return 80