Skip to content

Commit 41287fc

Browse files
authored
Merge pull request #339 from cloudify-cosmo/CY-2432-Keystone-v3-Validation
CY-2432-Keystore-v3-Validation
2 parents 03c00d6 + 9a861ec commit 41287fc

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

CHANGELOG.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
3.2.11:
2+
- Keystone V3 validation to refer to docs URL in case of missing configuration.
23
- Add public_ip property when using server_connected_to_floating_ip and if use_public_ip is set True.
34
3.2.10:
45
- Remove ID key from resource object if healing terminated VM.

openstack_sdk/common.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,12 @@ def validate_keystone_v3(self):
5959
if len(common) == 2:
6060
break
6161
else:
62-
message = 'Invalid domain combinations, they must be ' \
63-
'consistent with the following patterns: {0}'
64-
pattern = ''
65-
for item in self.domain_auth_sets:
66-
item = list(item)
67-
pattern = pattern + '({0}, {1}),'.format(item[0], item[1])
68-
raise InvalidDomainException(message.format(pattern))
62+
docs_url = 'https://docs.cloudify.co/5.0.5/working_with/'\
63+
'official_plugins/infrastructure/openstackv3/'\
64+
'#authentication-with-openstack'
65+
message = 'Invalid client_config, ' \
66+
'Please refer to Openstack Plugin url : {0}'
67+
raise InvalidDomainException(message.format(docs_url))
6968

7069
def configure_ssl(self):
7170
self._configure_ca_cert()

0 commit comments

Comments
 (0)