openstack/charm-swift-storage
Code Issues Proposed changes

s/pop/remove (d'oh!)

Browse Source
This commit is contained in:
Adam Collard 2015-08-14 11:53:58 +01:00
parent 0b34efdab0
commit 9c714e3450
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/actions.py
View File

@ -17,7 +17,7 @@ def _get_services():
services = SWIFT_SVCS[:] services = SWIFT_SVCS[:]
# Before Icehouse there was no swift-container-sync # Before Icehouse there was no swift-container-sync
if get_os_codename_package("swift-container") < "icehouse": if get_os_codename_package("swift-container") < "icehouse":
services.pop("swift-container-sync") services.remove("swift-container-sync")
return services return services

2
tests/basic_deployment.py
View File

@ -504,7 +504,7 @@ class SwiftStorageBasicDeployment(OpenStackAmuletDeployment):
'swift-object-server', 'swift-object-server',
'swift-object-updater'] 'swift-object-updater']
if self._get_openstack_release() < self.precise_icehouse: 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 # We can't use validate_unit_process_ids and friends because
# 1) they don't use -x on pidof, so can't find scripts # 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 ( # 2) they will fail straight away if the process isn't running (