diff --git a/tasks/cinder_service_setup.yml b/tasks/cinder_service_setup.yml
deleted file mode 100644
index 899ed777..00000000
--- a/tasks/cinder_service_setup.yml
+++ /dev/null
@@ -1,123 +0,0 @@
----
-# Copyright 2014, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# We set the python interpreter to the ansible runtime venv if
-# the delegation is to localhost so that we get access to the
-# appropriate python libraries in that venv. If the delegation
-# is to another host, we assume that it is accessible by the
-# system python instead.
-- name: Setup the service
-  delegate_to: "{{ cinder_service_setup_host }}"
-  vars:
-    ansible_python_interpreter: "{{ cinder_service_setup_host_python_interpreter }}"
-  block:
-    - name: Add services to the keystone service catalog
-      os_keystone_service:
-        cloud: default
-        state: "{{ item.state }}"
-        name: "{{ item.name }}"
-        service_type: "{{ item.service_type }}"
-        description: "{{ item.description }}"
-        endpoint_type: admin
-        verify: "{{ not keystone_service_adminuri_insecure }}"
-      register: add_service
-      until: add_service is success
-      retries: 5
-      delay: 10
-      with_items:
-        - name: "{{ cinder_service_name }}"
-          service_type: "{{ cinder_service_type }}"
-          description: "{{ cinder_service_description }}"
-          state: absent
-        - name: "{{ cinder_service_v2_name }}"
-          service_type: "{{ cinder_service_v2_type }}"
-          description: "{{ cinder_service_v2_description }}"
-          state: "{{ (cinder_enable_v2_api | bool) | ternary('present', 'absent') }}"
-        - name: "{{ cinder_service_v3_name }}"
-          service_type: "{{ cinder_service_v3_type }}"
-          description: "{{ cinder_service_v3_description }}"
-          state: present
-
-    - name: Add service user
-      os_user:
-        cloud: default
-        state: present
-        name: "{{ cinder_service_user_name }}"
-        password: "{{ cinder_service_password }}"
-        domain: default
-        default_project: "{{ cinder_service_project_name }}"
-        endpoint_type: admin
-        verify: "{{ not keystone_service_adminuri_insecure }}"
-      register: add_service
-      when: not cinder_service_in_ldap | bool
-      until: add_service is success
-      retries: 5
-      delay: 10
-      no_log: True
-
-    - name: Add service user to admin role
-      os_user_role:
-        cloud: default
-        state: present
-        user: "{{ cinder_service_user_name }}"
-        role: "{{ cinder_service_role_name }}"
-        project: "{{ cinder_service_project_name }}"
-        endpoint_type: admin
-        verify: "{{ not keystone_service_adminuri_insecure }}"
-      register: add_service
-      when: not cinder_service_in_ldap | bool
-      until: add_service is success
-      retries: 5
-      delay: 10
-
-    - name: Add endpoints to keystone endpoint catalog
-      os_keystone_endpoint:
-        cloud: default
-        state: "{{ item.state }}"
-        service: "{{ item.service }}"
-        endpoint_interface: "{{ item.interface }}"
-        url: "{{ item.url }}"
-        region: "{{ cinder_service_region }}"
-        endpoint_type: admin
-        verify: "{{ not keystone_service_adminuri_insecure }}"
-      register: add_service
-      until: add_service is success
-      retries: 5
-      delay: 10
-      with_items:
-        - service: "{{ cinder_service_v2_name }}"
-          interface: "public"
-          url: "{{ cinder_service_v2_publicurl }}"
-          state: "{{ (cinder_enable_v2_api | bool) | ternary('present', 'absent') }}"
-        - service: "{{ cinder_service_v2_name }}"
-          interface: "internal"
-          url: "{{ cinder_service_v2_internalurl }}"
-          state: "{{ (cinder_enable_v2_api | bool) | ternary('present', 'absent') }}"
-        - service: "{{ cinder_service_v2_name }}"
-          interface: "admin"
-          url: "{{ cinder_service_v2_adminurl }}"
-          state: "{{ (cinder_enable_v2_api | bool) | ternary('present', 'absent') }}"
-        - service: "{{ cinder_service_v3_name }}"
-          interface: "public"
-          url: "{{ cinder_service_v3_publicurl }}"
-          state: present
-        - service: "{{ cinder_service_v3_name }}"
-          interface: "internal"
-          url: "{{ cinder_service_v3_internalurl }}"
-          state: present
-        - service: "{{ cinder_service_v3_name }}"
-          interface: "admin"
-          url: "{{ cinder_service_v3_adminurl }}"
-          state: present
diff --git a/tasks/main.yml b/tasks/main.yml
index 7dab94fc..323c94cc 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -139,7 +139,18 @@
   tags:
     - cinder-config
 
-- import_tasks: cinder_service_setup.yml
+- include_tasks: service_setup.yml
+  vars:
+    _service_adminuri_insecure: "{{ keystone_service_adminuri_insecure }}"
+    _service_in_ldap: "{{ cinder_service_in_ldap }}"
+    _service_setup_host: "{{ cinder_service_setup_host }}"
+    _service_setup_host_python_interpreter: "{{ cinder_service_setup_host_python_interpreter }}"
+    _service_user_name: "{{ cinder_service_user_name }}"
+    _service_user_password: "{{ cinder_service_password }}"
+    _service_project_name: "{{ cinder_service_project_name }}"
+    _service_role_name: "{{ cinder_service_role_name }}"
+    _service_endpoints: "{{ cinder_service_endpoints }}"
+    _service_catalog: "{{ cinder_service_catalog }}"
   when:
     - "groups['cinder_api'] | length > 0"
     - "cinder_services['cinder-api']['group'] in group_names"
diff --git a/tasks/service_setup.yml b/tasks/service_setup.yml
new file mode 100644
index 00000000..8fdf4726
--- /dev/null
+++ b/tasks/service_setup.yml
@@ -0,0 +1,135 @@
+---
+# Copyright 2014, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# WARNING:
+# This file is maintained in the openstack-ansible-tests repository.
+# https://opendev.org/openstack/openstack-ansible-tests/src/sync/tasks/service_setup.yml
+# If you need to modify this file, update the one in the openstack-ansible-tests
+# repository. Once it merges there, the changes will automatically be proposed to
+# all the repositories which use it.
+
+# We set the python interpreter to the ansible runtime venv if
+# the delegation is to localhost so that we get access to the
+# appropriate python libraries in that venv. If the delegation
+# is to another host, we assume that it is accessible by the
+# system python instead.
+
+- name: Setup the OS service
+  delegate_to: "{{ _service_setup_host }}"
+  vars:
+    ansible_python_interpreter: "{{ _service_setup_host_python_interpreter }}"
+  block:
+    - name: Add service project
+      os_project:
+        cloud: default
+        state: present
+        name: "{{ _project_name }}"
+        description: "{{ _project_description | default('') }}"
+        domain_id: "default"
+        endpoint_type: admin
+        validate_certs: "{{ (not _service_adminuri_insecure | default('True')) | bool }}"
+      register: add_service
+      when:
+        - not _service_in_ldap | bool
+        - _project_name is defined
+      until: add_service is success
+      retries: 5
+      delay: 10
+
+    - name: Add services to the keystone service catalog
+      os_keystone_service:
+        cloud: default
+        state: "{{ item.state | default('present') }}"
+        name: "{{ item.name }}"
+        service_type: "{{ item.type }}"
+        description: "{{ item.description | default('') }}"
+        endpoint_type: admin
+        validate_certs: "{{ (not _service_adminuri_insecure | default('True')) | bool }}"
+      register: add_service
+      with_items: "{{ _service_catalog }}"
+      when: _service_catalog is defined
+      until: add_service is success
+      retries: 5
+      delay: 10
+
+    - name: Add default role
+      os_keystone_role:
+        cloud: default
+        state: present
+        name: "{{ _role_name }}"
+        endpoint_type: admin
+        validate_certs: "{{ (not _service_adminuri_insecure | default('True')) | bool }}"
+      register: add_service
+      when:
+        - not _service_in_ldap | bool
+        - _role_name is defined
+      until: add_service is success
+      retries: 5
+      delay: 10
+
+    - name: Add service user
+      os_user:
+        cloud: default
+        state: present
+        name: "{{ _service_user_name }}"
+        password: "{{ _service_user_password }}"
+        domain: default
+        default_project: "{{ _service_project_name }}"
+        endpoint_type: admin
+        validate_certs: "{{ (not _service_adminuri_insecure | default('True')) | bool }}"
+      register: add_service
+      when:
+        - not _service_in_ldap | bool
+        - _service_user_name is defined
+        - _service_user_password is defined
+      until: add_service is success
+      retries: 5
+      delay: 10
+      no_log: True
+
+    - name: Add service user to admin role
+      os_user_role:
+        cloud: default
+        state: present
+        user: "{{ _service_user_name }}"
+        role: "{{ _service_role_name }}"
+        project: "{{ _service_project_name }}"
+        endpoint_type: admin
+        validate_certs: "{{ (not _service_adminuri_insecure | default('True')) | bool }}"
+      register: add_service
+      when:
+        - not _service_in_ldap | bool
+        - _service_user_name is defined
+        - _service_role_name is defined
+      until: add_service is success
+      retries: 5
+      delay: 10
+
+    - name: Add endpoints to keystone endpoint catalog
+      os_keystone_endpoint:
+        cloud: default
+        state: "{{ item.state | default('present') }}"
+        service: "{{ item.service }}"
+        endpoint_interface: "{{ item.interface }}"
+        url: "{{ item.url }}"
+        region: "{{ _service_region | default('RegionOne') }}"
+        endpoint_type: admin
+        validate_certs: "{{ (not _service_adminuri_insecure | default('True')) | bool }}"
+      register: add_service
+      until: add_service is success
+      retries: 5
+      delay: 10
+      with_items: "{{ _service_endpoints }}"
+      when: _service_endpoints is defined
diff --git a/vars/main.yml b/vars/main.yml
index 4b7dd4e4..a44bd876 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -54,3 +54,43 @@ cinder_core_files:
     owner: "root"
     group: "{{ cinder_system_group_name }}"
     mode: "0640"
+
+cinder_service_endpoints:
+  - service: "{{ cinder_service_v2_name }}"
+    interface: "public"
+    url: "{{ cinder_service_v2_publicurl }}"
+    state: "{{ (cinder_enable_v2_api | bool) | ternary('present', 'absent') }}"
+  - service: "{{ cinder_service_v2_name }}"
+    interface: "internal"
+    url: "{{ cinder_service_v2_internalurl }}"
+    state: "{{ (cinder_enable_v2_api | bool) | ternary('present', 'absent') }}"
+  - service: "{{ cinder_service_v2_name }}"
+    interface: "admin"
+    url: "{{ cinder_service_v2_adminurl }}"
+    state: "{{ (cinder_enable_v2_api | bool) | ternary('present', 'absent') }}"
+  - service: "{{ cinder_service_v3_name }}"
+    interface: "public"
+    url: "{{ cinder_service_v3_publicurl }}"
+    state: present
+  - service: "{{ cinder_service_v3_name }}"
+    interface: "internal"
+    url: "{{ cinder_service_v3_internalurl }}"
+    state: present
+  - service: "{{ cinder_service_v3_name }}"
+    interface: "admin"
+    url: "{{ cinder_service_v3_adminurl }}"
+    state: present
+
+cinder_service_catalog:
+  - name: "{{ cinder_service_name }}"
+    type: "{{ cinder_service_type }}"
+    description: "{{ cinder_service_description }}"
+    state: absent
+  - name: "{{ cinder_service_v2_name }}"
+    type: "{{ cinder_service_v2_type }}"
+    description: "{{ cinder_service_v2_description }}"
+    state: "{{ (cinder_enable_v2_api | bool) | ternary('present', 'absent') }}"
+  - name: "{{ cinder_service_v3_name }}"
+    type: "{{ cinder_service_v3_type }}"
+    description: "{{ cinder_service_v3_description }}"
+    state: present