From ac98ed009cc40eb70a1fa08aceb17369df6ef241 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 16 Mar 2020 16:40:59 -0400 Subject: [PATCH] mgr/orch: accept port and ssl flags to 'apply rgw' Signed-off-by: Sage Weil --- src/pybind/mgr/orchestrator/module.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py index 9d479a02244..52e2ffa6932 100644 --- a/src/pybind/mgr/orchestrator/module.py +++ b/src/pybind/mgr/orchestrator/module.py @@ -762,15 +762,23 @@ Usage: 'orch apply rgw', 'name=realm_name,type=CephString ' 'name=zone_name,type=CephString ' + 'name=port,type=CephInt,req=false ' + 'name=ssl,type=CephBool,req=false ' 'name=placement,type=CephString,req=false ' 'name=unmanaged,type=CephBool,req=false', 'Update the number of RGW instances for the given zone') - def _apply_rgw(self, zone_name, realm_name, placement=None, unmanaged=False): + def _apply_rgw(self, zone_name, realm_name, + port=None, + ssl=False, + placement=None, + unmanaged=False): spec = RGWSpec( rgw_realm=realm_name, rgw_zone=zone_name, placement=PlacementSpec.from_string(placement), unmanaged=unmanaged, + rgw_frontend_port=port, + ssl=ssl, ) completion = self.apply_rgw(spec) self._orchestrator_wait([completion]) -- 2.39.5