openstack
/
charm-openstack-dashboard
Code Issues Proposed changes

Switch default-role default to lowercase 'member' 

This is needed to align with recent changes in the keystone
charm to use keystone bootstrap.

Change-Id: I35a08c483e970712d4db4ebe049f5b135ffb5637
Closes-Bug: #1879783
This commit is contained in:
Corey Bryant 2020-05-20 16:30:17 -04:00
parent 5cd569fad8
commit 3f1f985be8
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.yaml
View File

@ -58,7 +58,7 @@ options:
value of 1800 will log users out after 30 minutes.
default-role:
type: string
default: "Member"
default: "member"
description: |
Default role for Horizon operations that will be created in
Keystone upon introduction of an identity-service relation.

30
unit_tests/test_horizon_contexts.py
View File

@ -99,7 +99,7 @@ class TestHorizonContexts(CharmTestCase):
{'compress_offline': True,
'debug': False,
'customization_module': '',
'default_role': 'Member',
'default_role': 'member',
'webroot': '/horizon',
'ubuntu_theme': True,
'default_theme': None,
@ -133,7 +133,7 @@ class TestHorizonContexts(CharmTestCase):
self.assertEqual(horizon_contexts.HorizonContext()(),
{'compress_offline': True, 'debug': False,
'customization_module': '',
'default_role': 'Member', 'webroot': '/horizon',
'default_role': 'member', 'webroot': '/horizon',
'ubuntu_theme': True,
'default_theme': None,
'custom_theme': False,
@ -167,7 +167,7 @@ class TestHorizonContexts(CharmTestCase):
{'compress_offline': True,
'debug': False,
'customization_module': '',
'default_role': 'Member',
'default_role': 'member',
'webroot': '/horizon',
'ubuntu_theme': True,
'default_theme': None,
@ -201,7 +201,7 @@ class TestHorizonContexts(CharmTestCase):
self.assertEqual(horizon_contexts.HorizonContext()(),
{'compress_offline': True, 'debug': True,
'customization_module': '',
'default_role': 'Member', 'webroot': '/horizon',
'default_role': 'member', 'webroot': '/horizon',
'ubuntu_theme': True,
'default_theme': None,
'custom_theme': False,
@ -234,7 +234,7 @@ class TestHorizonContexts(CharmTestCase):
self.assertEqual(horizon_contexts.HorizonContext()(),
{'compress_offline': True, 'debug': False,
'customization_module': '',
'default_role': 'Member', 'webroot': '/horizon',
'default_role': 'member', 'webroot': '/horizon',
'ubuntu_theme': False,
'default_theme': None,
'custom_theme': False,
@ -268,7 +268,7 @@ class TestHorizonContexts(CharmTestCase):
self.assertEqual(horizon_contexts.HorizonContext()(),
{'compress_offline': True, 'debug': False,
'customization_module': '',
'default_role': 'Member', 'webroot': '/horizon',
'default_role': 'member', 'webroot': '/horizon',
'ubuntu_theme': False,
'default_theme': 'material',
'custom_theme': False,
@ -305,7 +305,7 @@ class TestHorizonContexts(CharmTestCase):
self.assertEqual(horizon_contexts.HorizonContext()(),
{'compress_offline': False, 'debug': False,
'customization_module': '',
'default_role': 'Member', 'webroot': '/horizon',
'default_role': 'member', 'webroot': '/horizon',
'ubuntu_theme': True,
'default_theme': None,
'custom_theme': False,
@ -371,7 +371,7 @@ class TestHorizonContexts(CharmTestCase):
self.assertEqual(horizon_contexts.HorizonContext()(),
{'compress_offline': True, 'debug': False,
'customization_module': '',
'default_role': 'Member', 'webroot': '/',
'default_role': 'member', 'webroot': '/',
'ubuntu_theme': True,
'default_theme': None,
'custom_theme': False,
@ -409,7 +409,7 @@ class TestHorizonContexts(CharmTestCase):
self.assertEqual(horizon_contexts.HorizonContext()(),
{'compress_offline': True, 'debug': False,
'customization_module': '',
'default_role': 'Member', 'webroot': '/horizon',
'default_role': 'member', 'webroot': '/horizon',
'ubuntu_theme': True,
'default_theme': None,
'custom_theme': False,
@ -442,7 +442,7 @@ class TestHorizonContexts(CharmTestCase):
self.assertEqual(horizon_contexts.HorizonContext()(),
{'compress_offline': True, 'debug': False,
'customization_module': '',
'default_role': 'Member', 'webroot': '/horizon',
'default_role': 'member', 'webroot': '/horizon',
'ubuntu_theme': True,
'default_theme': None,
'custom_theme': False,
@ -475,7 +475,7 @@ class TestHorizonContexts(CharmTestCase):
self.assertEqual(horizon_contexts.HorizonContext()(),
{'compress_offline': True, 'debug': False,
'customization_module': 'customization.py',
'default_role': 'Member', 'webroot': '/horizon',
'default_role': 'member', 'webroot': '/horizon',
'ubuntu_theme': True,
'default_theme': None,
'custom_theme': False,
@ -509,7 +509,7 @@ class TestHorizonContexts(CharmTestCase):
self.assertEqual(horizon_contexts.HorizonContext()(),
{'compress_offline': True, 'debug': False,
'customization_module': '',
'default_role': 'Member', 'webroot': '/horizon',
'default_role': 'member', 'webroot': '/horizon',
'ubuntu_theme': True,
'default_theme': None,
'custom_theme': False,
@ -543,7 +543,7 @@ class TestHorizonContexts(CharmTestCase):
self.assertEqual(horizon_contexts.HorizonContext()(),
{'compress_offline': True, 'debug': False,
'customization_module': '',
'default_role': 'Member', 'webroot': '/horizon',
'default_role': 'member', 'webroot': '/horizon',
'ubuntu_theme': True,
'default_theme': None,
'custom_theme': False,
@ -577,7 +577,7 @@ class TestHorizonContexts(CharmTestCase):
self.assertEqual(horizon_contexts.HorizonContext()(),
{'compress_offline': True, 'debug': False,
'customization_module': '',
'default_role': 'Member', 'webroot': '/horizon',
'default_role': 'member', 'webroot': '/horizon',
'ubuntu_theme': True,
'default_theme': None,
'custom_theme': False,
@ -611,7 +611,7 @@ class TestHorizonContexts(CharmTestCase):
self.assertEqual(horizon_contexts.HorizonContext()(),
{'compress_offline': True, 'debug': False,
'customization_module': '',
'default_role': 'Member', 'webroot': '/horizon',
'default_role': 'member', 'webroot': '/horizon',
'ubuntu_theme': True,
'default_theme': None,
'custom_theme': False,

4
unit_tests/test_horizon_hooks.py
View File

@ -281,7 +281,7 @@ class TestHorizonHooks(CharmTestCase):
self.relation_set.assert_called_with(
relation_id=None, service='None', region='None',
public_url='None', admin_url='None', internal_url='None',
requested_roles='Member'
requested_roles='member'
)
def test_keystone_joined_not_in_relation(self):
@ -289,7 +289,7 @@ class TestHorizonHooks(CharmTestCase):
self.relation_set.assert_called_with(
relation_id='identity/0', service='None', region='None',
public_url='None', admin_url='None', internal_url='None',
requested_roles='Member'
requested_roles='member'
)
def test_keystone_changed_no_cert(self):