openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Set also up-to-date overcloud flavor parameters"

Browse Source
This commit is contained in:
Zuul
2017-11-24 14:51:18 +00:00
committed by Gerrit Code Review
parent a3d3987cf5 73b5479c1d
commit 2ae6670274
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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': ''}}

2
tripleoclient/v1/overcloud_deploy.py
View File

@@ -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'),
) )