diff --git a/doc/source/roles/role-undercloud_disabled_services.rst b/doc/source/roles/role-undercloud_disabled_services.rst
new file mode 100644
index 000000000..186469f81
--- /dev/null
+++ b/doc/source/roles/role-undercloud_disabled_services.rst
@@ -0,0 +1,6 @@
+============================
+undercloud_disabled_services
+============================
+
+.. ansibleautoplugin::
+   :role: roles/undercloud_disabled_services
diff --git a/playbooks/undercloud-disabled-services.yaml b/playbooks/undercloud-disabled-services.yaml
new file mode 100644
index 000000000..cb8d32306
--- /dev/null
+++ b/playbooks/undercloud-disabled-services.yaml
@@ -0,0 +1,22 @@
+---
+- hosts: undercloud
+  vars:
+    metadata:
+      name: Verify undercloud services state before running update or upgrade
+      description: |
+        Check undercloud status before running a stack update - especially minor update and major upgrade.
+      groups:
+        - backup-and-restore
+        - post-upgrade
+        - pre-upgrade
+        - post-update
+        - pre-update
+      categories:
+        - os
+        - system
+        - systemd
+        - services
+      products:
+        - tripleo
+  roles:
+    - undercloud_disabled_services
diff --git a/roles/undercloud_disabled_services/defaults/main.yml b/roles/undercloud_disabled_services/defaults/main.yml
new file mode 100644
index 000000000..5d9c5f893
--- /dev/null
+++ b/roles/undercloud_disabled_services/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+undercloud_disabled_service_list:
+  - libvirtd
diff --git a/roles/undercloud_disabled_services/tasks/main.yml b/roles/undercloud_disabled_services/tasks/main.yml
new file mode 100644
index 000000000..80b7cd266
--- /dev/null
+++ b/roles/undercloud_disabled_services/tasks/main.yml
@@ -0,0 +1,18 @@
+---
+- name: Check Services are running
+  command: "/usr/bin/systemctl show {{ item }} --property ActiveState"
+  become: true
+  loop: "{{ undercloud_disabled_service_list }}"
+  register: "check_disabled_services"
+  changed_when: false
+  ignore_errors: true
+
+- name: Fail if services were running
+  fail:
+    msg: >-
+      One of the undercloud services was active.
+      Please check {{ item.item }} first and then confirm the status of
+      undercloud services in general before attempting to install, update
+      or upgrade the environment.
+  failed_when: "item.stdout  == 'ActiveState=active'"
+  loop: "{{ check_disabled_services.results }}"
diff --git a/roles/undercloud_disabled_services/vars/main.yaml b/roles/undercloud_disabled_services/vars/main.yaml
new file mode 100644
index 000000000..f934d5c10
--- /dev/null
+++ b/roles/undercloud_disabled_services/vars/main.yaml
@@ -0,0 +1,8 @@
+---
+metadata:
+  name: Verify undercloud services state before running update or upgrade
+  description: >
+    Check undercloud status before running a stack update - especially minor update and major upgrade.
+  groups:
+    - post-upgrade
+    - pre-upgrade