openstack/mistral
Code Issues Proposed changes

Merge "Moved to cinderv2 client support."

Browse Source
This commit is contained in:
Jenkins 2015-11-24 16:26:41 +00:00 committed by Gerrit Code Review
commit bda57341f8
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@
# limitations under the License.
from ceilometerclient.v2 import client as ceilometerclient
from cinderclient.v1 import client as cinderclient
from cinderclient.v2 import client as cinderclient
from glanceclient.v2 import client as glanceclient
from heatclient.v1 import client as heatclient
from keystoneclient import httpclient
@ -209,7 +209,7 @@ class CinderAction(base.OpenStackAction):
LOG.debug("Cinder action security context: %s" % ctx)
cinder_endpoint = keystone_utils.get_endpoint_for_project(
service_type='volume'
service_type='volumev2'
)
cinder_url = keystone_utils.format_url(

6
mistral/actions/openstack/mapping.json
View File

@ -670,7 +670,7 @@
"update_vpnservice": "update_vpnservice"
},
"cinder": {
"_comment": "It uses cinderclient.v1.",
"_comment": "It uses cinderclient.v2.",
"availability_zones_find": "availability_zones.find",
"availability_zones_findall": "availability_zones.findall",
"availability_zones_list": "availability_zones.list",
@ -682,6 +682,7 @@
"backups_get": "backups.get",
"backups_import_record": "backups.import_record",
"backups_list": "backups.list",
"capabilities_get": "capabilities.get",
"cgsnapshots_create": "cgsnapshots.create",
"cgsnapshots_delete": "cgsnapshots.delete",
"cgsnapshots_find": "cgsnapshots.find",
@ -690,6 +691,7 @@
"cgsnapshots_list": "cgsnapshots.list",
"cgsnapshots_update": "cgsnapshots.update",
"consistencygroups_create": "consistencygroups.create",
"consistencygroups_create_from_src": "consistencygroups.create_from_src",
"consistencygroups_delete": "consistencygroups.delete",
"consistencygroups_find": "consistencygroups.find",
"consistencygroups_findall": "consistencygroups.findall",
@ -766,6 +768,7 @@
"volumes_begin_detaching": "volumes.begin_detaching",
"volumes_create": "volumes.create",
"volumes_delete": "volumes.delete",
"volumes_delete_image_metadata": "volumes.delete_image_metadata",
"volumes_delete_metadata": "volumes.delete_metadata",
"volumes_detach": "volumes.detach",
"volumes_extend": "volumes.extend",
@ -787,6 +790,7 @@
"volumes_retype": "volumes.retype",
"volumes_roll_detaching": "volumes.roll_detaching",
"volumes_set_bootable": "volumes.set_bootable",
"volumes_set_image_metadata": "volumes.set_image_metadata",
"volumes_set_metadata": "volumes.set_metadata",
"volumes_terminate_connection": "volumes.terminate_connection",
"volumes_unmanage": "volumes.unmanage",