diff --git a/lower-constraints.txt b/lower-constraints.txt index 394729ad4..acf70c44e 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -114,7 +114,7 @@ python-glanceclient==2.8.0 python-glareclient==0.3.0 python-heatclient==1.10.0 python-ironic-inspector-client==1.5.0 -python-ironicclient==2.3.0 +python-ironicclient==2.7.0 python-keystoneclient==3.8.0 python-magnumclient==2.1.0 python-manilaclient==1.23.0 diff --git a/mistral/actions/openstack/actions.py b/mistral/actions/openstack/actions.py index 6a78fb2e7..e55a5e931 100644 --- a/mistral/actions/openstack/actions.py +++ b/mistral/actions/openstack/actions.py @@ -323,17 +323,22 @@ class IronicAction(base.OpenStackAction): ironic_endpoint = self.get_service_endpoint() - return self._get_client_class()( - ironic_endpoint.url, - token=context.auth_token, - region_name=ironic_endpoint.region, + session_and_auth = self.get_session_and_auth(context) + + client = self._get_client_class()( os_ironic_api_version=IRONIC_API_VERSION, - insecure=context.insecure + endpoint_override=ironic_endpoint.url, + session=session_and_auth['session'] ) + return client + @classmethod def _get_fake_client(cls): - return cls._get_client_class()("http://127.0.0.1:6385/") + return cls._get_client_class()( + endpoint_override="http://127.0.0.1:6385/", + session={"fake": "session"} + ) class BaremetalIntrospectionAction(base.OpenStackAction): diff --git a/requirements.txt b/requirements.txt index 6d45ab0e8..6eb5d33f3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -49,7 +49,7 @@ python-senlinclient>=1.1.0 # Apache-2.0 python-swiftclient>=3.2.0 # Apache-2.0 python-tackerclient>=0.8.0 # Apache-2.0 python-troveclient>=2.2.0 # Apache-2.0 -python-ironicclient!=2.5.2,!=2.7.1,>=2.3.0 # Apache-2.0 +python-ironicclient!=2.7.1,>=2.7.0 # Apache-2.0 python-ironic-inspector-client>=1.5.0 # Apache-2.0 python-vitrageclient>=2.0.0 # Apache-2.0 python-zaqarclient>=1.0.0 # Apache-2.0