diff --git a/actions/actions.py b/actions/actions.py index ef8791f..96fa481 100755 --- a/actions/actions.py +++ b/actions/actions.py @@ -17,7 +17,7 @@ def _get_services(): services = SWIFT_SVCS[:] # Before Icehouse there was no swift-container-sync if get_os_codename_package("swift-container") < "icehouse": - services.pop("swift-container-sync") + services.remove("swift-container-sync") return services diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index a016374..f87e38c 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -504,7 +504,7 @@ class SwiftStorageBasicDeployment(OpenStackAmuletDeployment): 'swift-object-server', 'swift-object-updater'] if self._get_openstack_release() < self.precise_icehouse: - swift_storage_services.pop('swift-container-sync') + swift_storage_services.remove('swift-container-sync') # We can't use validate_unit_process_ids and friends because # 1) they don't use -x on pidof, so can't find scripts # 2) they will fail straight away if the process isn't running (