From b4a46fd1e6093910b2e2b9084c0dd44628228580 Mon Sep 17 00:00:00 2001 From: Eyal Date: Thu, 26 Sep 2019 11:40:10 +0300 Subject: [PATCH] Remove volumes.promote and volumes.reenable action from cinder They were removed from cinder api see https://review.opendev.org/#/c/658318/ also move to cinder v3 (v2 is deprecated) Change-Id: I35dd5927465152bb70822638bbaf7573db1220f1 --- mistral/actions/openstack/actions.py | 4 ++-- mistral/actions/openstack/mapping.json | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/mistral/actions/openstack/actions.py b/mistral/actions/openstack/actions.py index 901ceb40b..06046b0c0 100644 --- a/mistral/actions/openstack/actions.py +++ b/mistral/actions/openstack/actions.py @@ -235,7 +235,7 @@ class NeutronAction(base.OpenStackAction): class CinderAction(base.OpenStackAction): - _service_type = 'volumev2' + _service_type = 'volumev3' @classmethod def _get_client_class(cls): @@ -268,7 +268,7 @@ class CinderAction(base.OpenStackAction): @classmethod def _get_fake_client(cls): - return cls._get_client_class()('2') + return cls._get_client_class()('3') class MistralAction(base.OpenStackAction): diff --git a/mistral/actions/openstack/mapping.json b/mistral/actions/openstack/mapping.json index a8492bdf1..79516e64d 100644 --- a/mistral/actions/openstack/mapping.json +++ b/mistral/actions/openstack/mapping.json @@ -632,7 +632,7 @@ "update_vpnservice": "update_vpnservice" }, "cinder": { - "_comment": "It uses cinderclient.v2.", + "_comment": "It uses cinderclient.v3.", "availability_zones_find": "availability_zones.find", "availability_zones_findall": "availability_zones.findall", "availability_zones_list": "availability_zones.list", @@ -746,8 +746,6 @@ "volumes_manage": "volumes.manage", "volumes_migrate_volume": "volumes.migrate_volume", "volumes_migrate_volume_completion": "volumes.migrate_volume_completion", - "volumes_promote": "volumes.promote", - "volumes_reenable": "volumes.reenable", "volumes_reserve": "volumes.reserve", "volumes_reset_state": "volumes.reset_state", "volumes_retype": "volumes.retype",