summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-18 22:52:15 +0000
committerGerrit Code Review <review@openstack.org>2019-01-18 22:52:15 +0000
commitb0d9506906d0fae2a6f67ab0ff950060550b094a (patch)
treebf7bce4dad4d7d5440e19b6f51905488c4b093b4
parent0d65744779b452b785294c0b75d8d3b64ee40e59 (diff)
parent6f76f8bec749e0bfa663570312db85d3b1a87183 (diff)
Merge "bugfix: Looking in wrong place for upgrade options"HEADmaster
-rw-r--r--armada/handlers/chart_deploy.py5
-rw-r--r--armada/tests/unit/handlers/test_armada.py5
2 files changed, 6 insertions, 4 deletions
diff --git a/armada/handlers/chart_deploy.py b/armada/handlers/chart_deploy.py
index 30671fd..203a145 100644
--- a/armada/handlers/chart_deploy.py
+++ b/armada/handlers/chart_deploy.py
@@ -121,8 +121,9 @@ class ChartDeploy(object):
121 121
122 upgrade = chart.get('upgrade', {}) 122 upgrade = chart.get('upgrade', {})
123 disable_hooks = upgrade.get('no_hooks', False) 123 disable_hooks = upgrade.get('no_hooks', False)
124 force = upgrade.get('force', False) 124 options = upgrade.get('options', {})
125 recreate_pods = upgrade.get('recreate_pods', False) 125 force = options.get('force', False)
126 recreate_pods = options.get('recreate_pods', False)
126 127
127 if upgrade: 128 if upgrade:
128 upgrade_pre = upgrade.get('pre', {}) 129 upgrade_pre = upgrade.get('pre', {})
diff --git a/armada/tests/unit/handlers/test_armada.py b/armada/tests/unit/handlers/test_armada.py
index 06321da..d1a35dc 100644
--- a/armada/tests/unit/handlers/test_armada.py
+++ b/armada/tests/unit/handlers/test_armada.py
@@ -437,8 +437,9 @@ class ArmadaHandlerTestCase(base.ArmadaTestCase):
437 if diff: 437 if diff:
438 upgrade = chart.get('upgrade', {}) 438 upgrade = chart.get('upgrade', {})
439 disable_hooks = upgrade.get('no_hooks', False) 439 disable_hooks = upgrade.get('no_hooks', False)
440 force = upgrade.get('force', False) 440 options = upgrade.get('options', {})
441 recreate_pods = upgrade.get( 441 force = options.get('force', False)
442 recreate_pods = options.get(
442 'recreate_pods', False) 443 'recreate_pods', False)
443 444
444 expected_update_release_calls.append( 445 expected_update_release_calls.append(