openstack
/
python-tripleoclient
Code Issues Proposed changes

Set also up-to-date overcloud flavor parameters 

Previously we've been setting just the deprecated variants of the
flavor parameters, which could cause problem with custom
role_data.yaml if it didn't include the appropriate
deprecated_param_flavor key for Controller or ObjectStorage roles. Now
we set both the deprecated (for old version support) and the
up-to-date parameter variant (for custom role data).

Change-Id: I53f1a7da3edf4accb9552bb7125e99e468124856
Closes-Bug: #1733327
This commit is contained in:
Jiri Stransky 2017-11-20 14:17:23 +01:00
parent 68b0da1c11
commit 73b5479c1d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
View File

@ -193,7 +193,8 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
mock_postconfig, mock_get_overcloud_endpoint,
mock_invoke_plan_env_wf):
arglist = ['--templates', '--ceph-storage-scale', '3', '--no-cleanup']
arglist = ['--templates', '--ceph-storage-scale', '3',
'--control-flavor', 'oooq_control', '--no-cleanup']
verifylist = [
('templates', '/usr/share/openstack-tripleo-heat-templates/'),
('ceph_storage_scale', 3)
@ -236,6 +237,8 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
parameters_env = {
'parameter_defaults': {
'CephStorageCount': 3,
'OvercloudControlFlavor': 'oooq_control',
'OvercloudControllerFlavor': 'oooq_control',
'StackAction': 'CREATE',
'UpdateIdentifier': ''}}

2
tripleoclient/v1/overcloud_deploy.py
View File

@ -87,8 +87,10 @@ class DeployOvercloud(command.Command):
('BlockStorageCount', 'block_storage_scale'),
('CephStorageCount', 'ceph_storage_scale'),
('OvercloudControlFlavor', 'control_flavor'),
('OvercloudControllerFlavor', 'control_flavor'),
('OvercloudComputeFlavor', 'compute_flavor'),
('OvercloudBlockStorageFlavor', 'block_storage_flavor'),
('OvercloudObjectStorageFlavor', 'swift_storage_flavor'),
('OvercloudSwiftStorageFlavor', 'swift_storage_flavor'),
('OvercloudCephStorageFlavor', 'ceph_storage_flavor'),
)