openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Fix tempest tenant_network_cidr and stack_owner_role"

Browse Source
This commit is contained in:
Dougal Matthews 2015-08-07 08:43:19 +02:00 committed by Gerrit Code Review
commit 74bd8fa9b2
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rdomanager_oscplugin/tests/v1/overcloud_validate/test_overcloud_validate.py
View File

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

12
rdomanager_oscplugin/v1/overcloud_validate.py
View File

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