diff --git a/heat/engine/clients/os/openstacksdk.py b/heat/engine/clients/os/openstacksdk.py index 8be8612dcc..a1ad0e2031 100644 --- a/heat/engine/clients/os/openstacksdk.py +++ b/heat/engine/clients/os/openstacksdk.py @@ -42,9 +42,13 @@ class OpenStackSDKPlugin(client_plugin.ClientPlugin): config=self._get_service_interfaces(), region_name=self._get_region_name(), app_name='heat', - app_version=heat.version.version_info.version_string()) + app_version=heat.version.version_info.version_string(), + **self._get_additional_create_args(version)) return connection.Connection(config=config) + def _get_additional_create_args(self, version): + return {} + def _get_service_interfaces(self): interfaces = {} if not os_service_types: diff --git a/heat/engine/clients/os/senlin.py b/heat/engine/clients/os/senlin.py index 66cb7dccb1..408cabe296 100644 --- a/heat/engine/clients/os/senlin.py +++ b/heat/engine/clients/os/senlin.py @@ -29,6 +29,11 @@ class SenlinClientPlugin(sdk_plugin.OpenStackSDKPlugin): client = super(SenlinClientPlugin, self)._create(version=version) return client.clustering + def _get_additional_create_args(self, version): + return { + 'clustering_api_version': version or '1' + } + def generate_spec(self, spec_type, spec_props): spec = {'properties': spec_props} spec['type'], spec['version'] = spec_type.split('-')