From 969b05fcf5884d6a096a546a68cc7e7809cd90fb Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Thu, 14 Jan 2021 13:42:40 -0800 Subject: [PATCH] swift-init: Re-enable targeted configs Change-Id: I6895a52c9f757e94cf0b304d85234dd00a4f5afa --- swift/common/manager.py | 2 ++ test/unit/common/test_manager.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/swift/common/manager.py b/swift/common/manager.py index 508ca96992..d8f98f4cd2 100644 --- a/swift/common/manager.py +++ b/swift/common/manager.py @@ -185,6 +185,8 @@ def format_server_name(servername): :param servername: server name :returns: swift compatible server name and its binary name """ + if '.' in servername: + servername = servername.split('.', 1)[0] if '-' not in servername: servername = '%s-server' % servername cmd = 'swift-%s' % servername diff --git a/test/unit/common/test_manager.py b/test/unit/common/test_manager.py index cc89089030..959c183933 100644 --- a/test/unit/common/test_manager.py +++ b/test/unit/common/test_manager.py @@ -313,6 +313,8 @@ class TestManagerModule(unittest.TestCase): # test valid servers self.assertTrue(manager.verify_server('object')) self.assertTrue(manager.verify_server('object-server')) + self.assertTrue(manager.verify_server('object.replication')) + self.assertTrue(manager.verify_server('object-server.1')) # test invalid servers self.assertFalse(manager.verify_server('test')) self.assertFalse(manager.verify_server('test-server'))