Merge "cleanup no longer needed task for cinder"

ansible/roles/cinder/tasks/upgrade.yml

@@ -32,19 +32,3 @@
     volumes: "{{ cinder_api.volumes }}"
   run_once: True
   delegate_to: "{{ groups[cinder_api.group][0] }}"
-
-# TODO(wuchunyang): Remove this task in 'X' cycle.
-- name: Remove Cinder v2 service
-  become: true
-  kolla_toolbox:
-    module_name: "os_keystone_service"
-    module_args:
-      name: "cinderv2"
-      service_type: "volumev2"
-      description: "Openstack Block Storage"
-      region_name: "{{ openstack_region_name }}"
-      auth: "{{ openstack_auth }}"
-      interface: "{{ openstack_interface }}"
-      cacert: "{{ openstack_cacert }}"
-      state: "absent"
-  run_once: True