Skip to content

Commit

Permalink
Merge pull request #339 from cloudify-cosmo/CY-2432-Keystone-v3-Valid…
Browse files Browse the repository at this point in the history
…ation

CY-2432-Keystore-v3-Validation
  • Loading branch information
EarthmanT authored Mar 15, 2020
2 parents 03c00d6 + 9a861ec commit 41287fc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
3.2.11:
- Keystone V3 validation to refer to docs URL in case of missing configuration.
- Add public_ip property when using server_connected_to_floating_ip and if use_public_ip is set True.
3.2.10:
- Remove ID key from resource object if healing terminated VM.
Expand Down
13 changes: 6 additions & 7 deletions openstack_sdk/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,12 @@ def validate_keystone_v3(self):
if len(common) == 2:
break
else:
message = 'Invalid domain combinations, they must be ' \
'consistent with the following patterns: {0}'
pattern = ''
for item in self.domain_auth_sets:
item = list(item)
pattern = pattern + '({0}, {1}),'.format(item[0], item[1])
raise InvalidDomainException(message.format(pattern))
docs_url = 'https://docs.cloudify.co/5.0.5/working_with/'\
'official_plugins/infrastructure/openstackv3/'\
'#authentication-with-openstack'
message = 'Invalid client_config, ' \
'Please refer to Openstack Plugin url : {0}'
raise InvalidDomainException(message.format(docs_url))

def configure_ssl(self):
self._configure_ca_cert()
Expand Down

0 comments on commit 41287fc

Please sign in to comment.