openstack
/
mistral
Code Issues Proposed changes

Merge "Fix error about SenlinAction"

This commit is contained in:
Zuul 2018-04-26 11:23:57 +00:00 committed by Gerrit Code Review
parent bfb6548027 92b6016e3d
commit 55b1d70132
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mistral/actions/generator_factory.py
View File

@ -21,7 +21,7 @@ SUPPORTED_MODULES = [
'Nova', 'Glance', 'Keystone', 'Heat', 'Neutron', 'Cinder',
'Trove', 'Ironic', 'Baremetal Introspection', 'Swift', 'SwiftService',
'Zaqar', 'Barbican', 'Mistral', 'Designate', 'Magnum', 'Murano', 'Tacker',
'Aodh', 'Gnocchi', 'Glare', 'Vitrage'
'Aodh', 'Gnocchi', 'Glare', 'Vitrage', 'Senlin'
]

3
mistral/actions/openstack/actions.py
View File

@ -819,7 +819,8 @@ class SenlinAction(base.OpenStackAction):
@classmethod
def _get_fake_client(cls):
return cls._get_client_class()("http://127.0.0.1:8778")
sess = keystone_utils.get_admin_session()
return cls._get_client_class()(authenticator=sess.auth)
class AodhAction(base.OpenStackAction):

2
mistral/tests/unit/actions/openstack/test_generator.py
View File

@ -58,7 +58,7 @@ MODULE_MAPPING = {
'vitrage': ['vitrage.alarm_get', actions.VitrageAction]
}
EXTRA_MODULES = ['neutron', 'swift', 'zaqar', 'tacker']
EXTRA_MODULES = ['neutron', 'swift', 'zaqar', 'tacker', 'senlin']
CONF = cfg.CONF