From 0dd0af0773600cbc7fdebb1d3ff195b907f0f10d Mon Sep 17 00:00:00 2001 From: Imre Farkas Date: Wed, 22 Jul 2015 12:16:17 +0200 Subject: [PATCH] Fix tempest tenant_network_cidr and stack_owner_role Change-Id: I5923d000829b4a8874fab01c74a42c0357ec5658 --- .../v1/overcloud_validate/test_overcloud_validate.py | 12 +++++++----- rdomanager_oscplugin/v1/overcloud_validate.py | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/rdomanager_oscplugin/tests/v1/overcloud_validate/test_overcloud_validate.py b/rdomanager_oscplugin/tests/v1/overcloud_validate/test_overcloud_validate.py index 4abe90f78..01f8ff099 100644 --- a/rdomanager_oscplugin/tests/v1/overcloud_validate/test_overcloud_validate.py +++ b/rdomanager_oscplugin/tests/v1/overcloud_validate/test_overcloud_validate.py @@ -60,15 +60,17 @@ class TestOvercloudValidate(fakes.TestOvercloudValidate): '--network-id 42 ' '--deployer-input partial_config_file ' '--debug --create ' - 'identity.uri http://foo ' 'compute.allow_tenant_isolation true ' - 'object-storage.operator_role swiftoperator ' - 'identity.admin_password password ' 'compute.build_timeout 500 ' 'compute.image_ssh_user cirros ' 'compute.ssh_user cirros ' + 'identity.admin_password password ' + 'identity.uri http://foo ' 'network.build_timeout 500 ' - 'volume.build_timeout 500 ' - 'scenario.ssh_user cirros'), + 'network.tenant_network_cidr 192.168.0.0/24 ' + 'object-storage.operator_role swiftoperator ' + 'orchestration.stack_owner_role heat_stack_user ' + 'scenario.ssh_user cirros ' + 'volume.build_timeout 500'), mock.call('./tools/run-tests.sh bar --skip-file skip') ]) diff --git a/rdomanager_oscplugin/v1/overcloud_validate.py b/rdomanager_oscplugin/v1/overcloud_validate.py index f2537677b..c4938e41a 100644 --- a/rdomanager_oscplugin/v1/overcloud_validate.py +++ b/rdomanager_oscplugin/v1/overcloud_validate.py @@ -47,16 +47,18 @@ class ValidateOvercloud(command.Command): '--network-id %(network_id)s ' '--deployer-input %(partial_config_file)s ' '--debug --create ' - 'identity.uri %(auth_url)s ' 'compute.allow_tenant_isolation true ' - 'object-storage.operator_role swiftoperator ' - 'identity.admin_password %(admin_password)s ' 'compute.build_timeout 500 ' 'compute.image_ssh_user cirros ' 'compute.ssh_user cirros ' + 'identity.admin_password %(admin_password)s ' + 'identity.uri %(auth_url)s ' 'network.build_timeout 500 ' - 'volume.build_timeout 500 ' - 'scenario.ssh_user cirros' % + 'network.tenant_network_cidr 192.168.0.0/24 ' + 'object-storage.operator_role swiftoperator ' + 'orchestration.stack_owner_role heat_stack_user ' + 'scenario.ssh_user cirros ' + 'volume.build_timeout 500' % {'network_id': network_id, 'partial_config_file': deployer_input, 'auth_url': overcloud_auth_url,