Merge pull request #146 from gnuoy/fix-swift-storage-region-option

Fix name of swift storage-region option
This commit is contained in:
Chris MacNaughton
2019-12-17 13:31:11 +01:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@@ -104,7 +104,7 @@ class TestSwiftUtils(ut_utils.BaseTestCase):
region = int(app_name.split('-')[2].replace('region', ''))
zone = int(app_name.split('-')[3].replace('zone', ''))
app_config[app_name] = {
'region': {'value': region},
'storage-region': {'value': region},
'zone': {'value': zone}}
self.get_application_config.side_effect = \

View File

@@ -204,7 +204,7 @@ def get_swift_storage_topology(model_name=None):
app_config = zaza.model.get_application_config(
app_name,
model_name=model_name)
region = app_config['region']['value']
region = app_config['storage-region']['value']
zone = app_config['zone']['value']
for unit in zaza.model.get_units(app_name, model_name=model_name):
topology[unit.public_address] = {