Merge "Set also up-to-date overcloud flavor parameters"
This commit is contained in:
commit
2ae6670274
|
@ -199,7 +199,8 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
|
||||||
mock_postconfig, mock_get_overcloud_endpoint,
|
mock_postconfig, mock_get_overcloud_endpoint,
|
||||||
mock_invoke_plan_env_wf):
|
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 = [
|
verifylist = [
|
||||||
('templates', '/usr/share/openstack-tripleo-heat-templates/'),
|
('templates', '/usr/share/openstack-tripleo-heat-templates/'),
|
||||||
('ceph_storage_scale', 3)
|
('ceph_storage_scale', 3)
|
||||||
|
@ -242,6 +243,8 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
|
||||||
parameters_env = {
|
parameters_env = {
|
||||||
'parameter_defaults': {
|
'parameter_defaults': {
|
||||||
'CephStorageCount': 3,
|
'CephStorageCount': 3,
|
||||||
|
'OvercloudControlFlavor': 'oooq_control',
|
||||||
|
'OvercloudControllerFlavor': 'oooq_control',
|
||||||
'StackAction': 'CREATE',
|
'StackAction': 'CREATE',
|
||||||
'UpdateIdentifier': ''}}
|
'UpdateIdentifier': ''}}
|
||||||
|
|
||||||
|
|
|
@ -87,8 +87,10 @@ class DeployOvercloud(command.Command):
|
||||||
('BlockStorageCount', 'block_storage_scale'),
|
('BlockStorageCount', 'block_storage_scale'),
|
||||||
('CephStorageCount', 'ceph_storage_scale'),
|
('CephStorageCount', 'ceph_storage_scale'),
|
||||||
('OvercloudControlFlavor', 'control_flavor'),
|
('OvercloudControlFlavor', 'control_flavor'),
|
||||||
|
('OvercloudControllerFlavor', 'control_flavor'),
|
||||||
('OvercloudComputeFlavor', 'compute_flavor'),
|
('OvercloudComputeFlavor', 'compute_flavor'),
|
||||||
('OvercloudBlockStorageFlavor', 'block_storage_flavor'),
|
('OvercloudBlockStorageFlavor', 'block_storage_flavor'),
|
||||||
|
('OvercloudObjectStorageFlavor', 'swift_storage_flavor'),
|
||||||
('OvercloudSwiftStorageFlavor', 'swift_storage_flavor'),
|
('OvercloudSwiftStorageFlavor', 'swift_storage_flavor'),
|
||||||
('OvercloudCephStorageFlavor', 'ceph_storage_flavor'),
|
('OvercloudCephStorageFlavor', 'ceph_storage_flavor'),
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue