diff --git a/tasks/main.yml b/tasks/main.yml
index e7148f4d..a6d78de9 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -116,8 +116,38 @@
     - nova-config
     - systemd-service
 
-- import_tasks: octavia_service_add.yml
-  run_once: true
+- import_tasks: service_setup.yml
+  vars:
+    _service_adminuri_insecure: "{{ keystone_service_adminuri_insecure }}"
+    _service_in_ldap: "{{ octavia_service_in_ldap }}"
+    _service_setup_host: "{{ octavia_service_setup_host }}"
+    _service_setup_host_python_interpreter: "{{ octavia_service_setup_host_python_interpreter }}"
+    _service_project_name: "{{ octavia_service_project_name }}"
+    _service_region: "{{ octavia_service_region }}"
+    _service_users:
+      - name: "{{ octavia_service_user_name }}"
+        password: "{{ octavia_service_password }}"
+        role: "{{ octavia_service_role_name }}"
+      - role: load-balancer_observer
+      - role: load-balancer_global_observer
+      - role: load-balancer_member
+      - role: load-balancer_admin
+      - role: load-balancer_quota_admin
+    _service_endpoints:
+      - service: "{{ octavia_service_name }}"
+        interface: "public"
+        url: "{{ octavia_service_publicuri }}"
+      - service: "{{ octavia_service_name }}"
+        interface: "internal"
+        url: "{{ octavia_service_internaluri }}"
+      - service: "{{ octavia_service_name }}"
+        interface: "admin"
+        url: "{{ octavia_service_adminuri }}"
+    _service_catalog:
+      - name: "{{ octavia_service_name }}"
+        type: "{{ octavia_service_type }}"
+        description: "{{ octavia_service_description }}"
+  when: inventory_hostname == groups['octavia_all'][0]
   tags:
     - octavia-install
 
diff --git a/tasks/octavia_service_add.yml b/tasks/octavia_service_add.yml
deleted file mode 100644
index a6881c51..00000000
--- a/tasks/octavia_service_add.yml
+++ /dev/null
@@ -1,111 +0,0 @@
----
-# Copyright 2017, 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: "{{ octavia_service_setup_host }}"
-  vars:
-    ansible_python_interpreter: "{{ octavia_service_setup_host_python_interpreter }}"
-  block:
-    - name: Add service to the keystone service catalog
-      os_keystone_service:
-        cloud: default
-        state: present
-        name: "{{ octavia_service_name }}"
-        service_type: "{{ octavia_service_type }}"
-        description: "{{ octavia_service_description }}"
-        interface: admin
-        verify: "{{ not keystone_service_adminuri_insecure }}"
-      register: add_service
-      until: add_service is success
-      retries: 5
-      delay: 10
-
-    - name: Add service user
-      os_user:
-        cloud: default
-        state: present
-        name: "{{ octavia_service_user_name }}"
-        password: "{{ octavia_service_password }}"
-        domain: default
-        default_project: "{{ octavia_service_project_name }}"
-        interface: admin
-        verify: "{{ not keystone_service_adminuri_insecure }}"
-      register: add_service
-      when: not octavia_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: "{{ octavia_service_user_name }}"
-        role: "{{ octavia_service_role_name }}"
-        project: "{{ octavia_service_project_name }}"
-        interface: admin
-        verify: "{{ not keystone_service_adminuri_insecure }}"
-      register: add_service
-      when: not octavia_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: present
-        service: "{{ octavia_service_name }}"
-        endpoint_interface: "{{ item.interface }}"
-        url: "{{ item.url }}"
-        region: "{{ octavia_service_region }}"
-        interface: admin
-        verify: "{{ not keystone_service_adminuri_insecure }}"
-      register: add_service
-      until: add_service is success
-      retries: 5
-      delay: 10
-      with_items:
-        - interface: "public"
-          url: "{{ octavia_service_publicuri }}"
-        - interface: "internal"
-          url: "{{ octavia_service_internaluri }}"
-        - interface: "admin"
-          url: "{{ octavia_service_adminuri }}"
-      when: octavia_v2 | bool
-
-    - name: Create service roles
-      os_keystone_role:
-        cloud: default
-        state: present
-        name: "{{ item }}"
-        interface: admin
-        verify: "{{ not keystone_service_adminuri_insecure }}"
-      register: add_roles
-      until: add_roles is success
-      retries: 5
-      delay: 10
-      with_items:
-        - load-balancer_observer
-        - load-balancer_global_observer
-        - load-balancer_member
-        - load-balancer_admin
-        - load-balancer_quota_admin
diff --git a/tasks/service_setup.yml b/tasks/service_setup.yml
new file mode 100644
index 00000000..0ff5465f
--- /dev/null
+++ b/tasks/service_setup.yml
@@ -0,0 +1,159 @@
+---
+# Copyright 2019, VEXXHOST, 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 keystone domain
+      os_keystone_domain:
+        cloud: default
+        state: present
+        name: "{{ _domain_name }}"
+        endpoint_type: admin
+        verify: "{{ not _service_adminuri_insecure }}"
+      register: add_domain
+      when: _domain_name is defined
+      until: add_domain is success
+      retries: 5
+      delay: 10
+
+    - name: Add service project
+      os_project:
+        cloud: default
+        state: present
+        name: "{{ _project_name }}"
+        description: "{{ _project_description | default(omit) }}"
+        domain_id: "{{ _project_domain | default('default') }}"
+        endpoint_type: admin
+        validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}"
+      register: add_service
+      when:
+        - not (_service_in_ldap | default(False) | 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 keystone roles
+      os_keystone_role:
+        cloud: default
+        state: present
+        name: "{{ item.role }}"
+        endpoint_type: admin
+        validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}"
+      register: add_service
+      when:
+        - not (_service_in_ldap | default(False) | bool)
+        - _service_users is defined
+        - "'role' in item"
+        - (item.condition | default(True)) | bool
+      until: add_service is success
+      with_items: "{{ _service_users }}"
+      retries: 5
+      delay: 10
+
+    - name: Add service users
+      os_user:
+        cloud: default
+        state: present
+        name: "{{ item.name }}"
+        password: "{{ item.password }}"
+        domain: "{{ item.domain | default('default') }}"
+        default_project: "{{ item.project | default(_service_project_name) }}"
+        endpoint_type: admin
+        validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}"
+        update_password: always
+      register: add_service
+      when:
+        - not (_service_in_ldap | default(False) | bool)
+        - _service_users is defined
+        - "'name' in item"
+        - "'password' in item"
+        - (item.condition | default(True)) | bool
+      until: add_service is success
+      with_items: "{{ _service_users }}"
+      retries: 5
+      delay: 10
+      no_log: True
+
+    - name: Add service users to the role
+      os_user_role:
+        cloud: default
+        state: present
+        user: "{{ item.name }}"
+        role: "{{ item.role }}"
+        project: "{{ item.project | default(_service_project_name) }}"
+        domain: "{{ item.domain | default(omit) }}"
+        endpoint_type: admin
+        validate_certs: "{{ not (_service_adminuri_insecure | default(True) | bool) }}"
+      register: add_service
+      when:
+        - not (_service_in_ldap | default(False) | bool)
+        - _service_users is defined
+        - "'name' in item"
+        - "'role' in item"
+        - (item.condition | default(True)) | bool
+      until: add_service is success
+      with_items: "{{ _service_users }}"
+      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