Merge "Make the service_type more consistent"

contrib/devstack/lib/mistral

@@ -71,7 +71,7 @@ function create_mistral_accounts() {
     if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
         MISTRAL_SERVICE=$(openstack service create \
             mistral \
-            --type=workflow_service \
+            --type=workflow \
             --description="Workflow Service" \
             | grep " id " | get_field 2)
         openstack endpoint create \

functionaltests/api/base.py

@@ -32,7 +32,7 @@ class MistralClient(rest_client.RestClient):
     def __init__(self, auth_provider):
         super(MistralClient, self).__init__(auth_provider)
 
-        self.service = 'workflow_service'
+        self.service = 'workflow'
         self.endpoint_url = 'publicURL'
 
     def get_list_obj(self, name):