diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 9a50c85451..fcc3a95d91 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -4,9 +4,6 @@
   # On upgrade certain roles can be disabled for operator driven upgrades
   # See major_upgrade_steps.j2.yaml and post-upgrade.j2.yaml
   {%- set enabled_roles = roles -%}
-  {%- set is_upgrade = false -%}
-{%- else %}
-  {%- set is_upgrade = true -%}
 {%- endif -%}
 {%- set primary_role = [enabled_roles[0]] -%}
 {%- for role in enabled_roles -%}
@@ -268,11 +265,7 @@ resources:
                 tasks:
                   # Join host_prep_tasks with the other per-host configuration
                   list_concat:
-{%- if is_upgrade|default(false) and role.disable_upgrade_deployment|default(false) %}
-                    - []
-{%- else %}
                     - {get_param: [role_data, {{role.name}}, host_prep_tasks]}
-{%- endif %}
                     -
                       # FIXME: can we move docker-puppet somewhere so it's installed via a package?
                       - name: Create /var/lib/docker-puppet
diff --git a/deployed-server/deployed-server-roles-data.yaml b/deployed-server/deployed-server-roles-data.yaml
index cbfc4c2b74..784f005bad 100644
--- a/deployed-server/deployed-server-roles-data.yaml
+++ b/deployed-server/deployed-server-roles-data.yaml
@@ -161,7 +161,6 @@
   CountDefault: 1
   HostnameFormatDefault: '%stackname%-novacompute-%index%'
   disable_constraints: True
-  disable_upgrade_deployment: True
   networks:
     - InternalApi
     - Tenant
@@ -240,7 +239,6 @@
     - InternalApi
     - Storage
     - StorageMgmt
-  disable_upgrade_deployment: True
   ServicesDefault:
     - OS::TripleO::Services::AuditD
     - OS::TripleO::Services::CACerts
diff --git a/extraconfig/tasks/tripleo_upgrade_node.sh b/extraconfig/tasks/tripleo_upgrade_node.sh
deleted file mode 100644
index c63ea938bc..0000000000
--- a/extraconfig/tasks/tripleo_upgrade_node.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-#
-# This delivers the operator driven upgrade script to be invoked as part of
-# the tripleo major upgrade workflow. The utility 'upgrade-non-controller.sh'
-# is used from the undercloud to invoke the /root/tripleo_upgrade_node.sh
-#
-set -eu
-
-UPGRADE_SCRIPT=/root/tripleo_upgrade_node.sh
-
-cat > $UPGRADE_SCRIPT << ENDOFCAT
-### DO NOT MODIFY THIS FILE
-### This file is automatically delivered to those nodes where the
-### disable_upgrade_deployment flag is set in roles_data.yaml.
-
-set -eu
-NOVA_COMPUTE=""
-if hiera -c /etc/puppet/hiera.yaml service_names | grep nova_compute ; then
-   NOVA_COMPUTE="true"
-fi
-SWIFT_STORAGE=""
-if hiera -c /etc/puppet/hiera.yaml service_names | grep swift_storage ; then
-   SWIFT_STORAGE="true"
-fi
-
-DEBUG="true"
-SCRIPT_NAME=$(basename $0)
-$(declare -f log_debug)
-
-NODE_NAME=\$(cat /etc/hostname)
-
-log_debug "$UPGRADE_SCRIPT has completed on \${NODE_NAME} - moving onto ansible playbooks"
-
-echo "----------------------------------------------------
-The TripleO upgrade tasks has completed on \${NODE_NAME}
-Moving onto ansible playbooks
-----------------------------------------------------"
-
-ENDOFCAT
-
-# ensure the permissions are OK
-chmod 0755 $UPGRADE_SCRIPT
-
diff --git a/releasenotes/notes/remove_disable_upgrade_deployment_flag-872df40d7ff171b8.yaml b/releasenotes/notes/remove_disable_upgrade_deployment_flag-872df40d7ff171b8.yaml
new file mode 100644
index 0000000000..53fd3c5f0d
--- /dev/null
+++ b/releasenotes/notes/remove_disable_upgrade_deployment_flag-872df40d7ff171b8.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    The disable_upgrade_deployment flag is now completely removed from
+    the roles_data. It will have no effect if you continue to include
+    this flag. It has not been used since the Pike upgrade. In Queens
+    the upgrade workflow is delivered with ansible playbooks.
diff --git a/roles/Compute.yaml b/roles/Compute.yaml
index 53ed8ce73f..5a5abf2bdd 100644
--- a/roles/Compute.yaml
+++ b/roles/Compute.yaml
@@ -20,7 +20,6 @@
   deprecated_param_ips: 'NovaComputeIPs'
   deprecated_server_resource_name: 'NovaCompute'
   deprecated_nic_config_name: 'compute.yaml'
-  disable_upgrade_deployment: True
   ServicesDefault:
     - OS::TripleO::Services::Aide
     - OS::TripleO::Services::AuditD
diff --git a/roles/ComputeAlt.yaml b/roles/ComputeAlt.yaml
index 60684b3380..daee1e8887 100644
--- a/roles/ComputeAlt.yaml
+++ b/roles/ComputeAlt.yaml
@@ -10,7 +10,6 @@
     - Tenant
     - Storage
   HostnameFormatDefault: '%stackname%-novacomputealt-%index%'
-  disable_upgrade_deployment: True
   disable_constraints: True
   ServicesDefault:
     - OS::TripleO::Services::AuditD
diff --git a/roles/ComputeHCI.yaml b/roles/ComputeHCI.yaml
index 3fec679be5..e35e959669 100644
--- a/roles/ComputeHCI.yaml
+++ b/roles/ComputeHCI.yaml
@@ -9,7 +9,6 @@
     - Tenant
     - Storage
     - StorageMgmt
-  disable_upgrade_deployment: True
   ServicesDefault:
     - OS::TripleO::Services::Aide
     - OS::TripleO::Services::AuditD
diff --git a/roles/ComputeInstanceHA.yaml b/roles/ComputeInstanceHA.yaml
index f543c9cab7..c771029287 100644
--- a/roles/ComputeInstanceHA.yaml
+++ b/roles/ComputeInstanceHA.yaml
@@ -10,7 +10,6 @@
     - Tenant
     - Storage
   HostnameFormatDefault: '%stackname%-novacomputeiha-%index%'
-  disable_upgrade_deployment: True
   ServicesDefault:
     - OS::TripleO::Services::Aide
     - OS::TripleO::Services::AuditD
diff --git a/roles/ComputeOvsDpdk.yaml b/roles/ComputeOvsDpdk.yaml
index 4cc5240d6f..a71d85bdb1 100644
--- a/roles/ComputeOvsDpdk.yaml
+++ b/roles/ComputeOvsDpdk.yaml
@@ -10,7 +10,6 @@
     - Tenant
     - Storage
   HostnameFormatDefault: '%stackname%-computeovsdpdk-%index%'
-  disable_upgrade_deployment: True
   deprecated_nic_config_name: 'compute-dpdk.yaml'
   ServicesDefault:
     - OS::TripleO::Services::Aide
diff --git a/roles/ComputeOvsDpdkRT.yaml b/roles/ComputeOvsDpdkRT.yaml
index 45e7f9166c..14a2030efd 100644
--- a/roles/ComputeOvsDpdkRT.yaml
+++ b/roles/ComputeOvsDpdkRT.yaml
@@ -13,7 +13,6 @@
   ImageDefault: overcloud-realtime-compute
   RoleParametersDefault:
     TunedProfileName: "realtime-virtual-host"
-  disable_upgrade_deployment: True
   ServicesDefault:
     - OS::TripleO::Services::Aide
     - OS::TripleO::Services::AuditD
diff --git a/roles/ComputeRealTime.yaml b/roles/ComputeRealTime.yaml
index 2ee36a8078..66315faffa 100644
--- a/roles/ComputeRealTime.yaml
+++ b/roles/ComputeRealTime.yaml
@@ -13,7 +13,6 @@
     - Tenant
     - Storage
   HostnameFormatDefault: '%stackname%-computerealtime-%index%'
-  disable_upgrade_deployment: True
   ImageDefault: overcloud-realtime-compute
   RoleParametersDefault:
     TunedProfileName: "realtime-virtual-host"
diff --git a/roles/ComputeSriov.yaml b/roles/ComputeSriov.yaml
index 7960ce9f5c..e949a82033 100644
--- a/roles/ComputeSriov.yaml
+++ b/roles/ComputeSriov.yaml
@@ -10,7 +10,6 @@
     - Tenant
     - Storage
   HostnameFormatDefault: '%stackname%-computesriov-%index%'
-  disable_upgrade_deployment: True
   ServicesDefault:
     - OS::TripleO::Services::Aide
     - OS::TripleO::Services::AuditD
diff --git a/roles/ComputeSriovRT.yaml b/roles/ComputeSriovRT.yaml
index 1157ac7035..20ccbafae8 100644
--- a/roles/ComputeSriovRT.yaml
+++ b/roles/ComputeSriovRT.yaml
@@ -10,7 +10,6 @@
     - Tenant
     - Storage
   HostnameFormatDefault: '%stackname%-computesriovrt-%index%'
-  disable_upgrade_deployment: True
   ImageDefault: overcloud-realtime-compute
   RoleParametersDefault:
     TunedProfileName: "realtime-virtual-host"
diff --git a/roles/HciCephAll.yaml b/roles/HciCephAll.yaml
index 4561577fbc..6b273fa678 100644
--- a/roles/HciCephAll.yaml
+++ b/roles/HciCephAll.yaml
@@ -9,7 +9,6 @@
     - Tenant
     - Storage
     - StorageMgmt
-  disable_upgrade_deployment: True
   HostnameFormatDefault: '%stackname%-hci-ceph-all-%index%'
   ServicesDefault:
     - OS::TripleO::Services::Aide
diff --git a/roles/HciCephFile.yaml b/roles/HciCephFile.yaml
index 928dc0fa1b..2b436e57c1 100644
--- a/roles/HciCephFile.yaml
+++ b/roles/HciCephFile.yaml
@@ -9,7 +9,6 @@
     - Tenant
     - Storage
     - StorageMgmt
-  disable_upgrade_deployment: True
   HostnameFormatDefault: '%stackname%-hci-ceph-file-%index%'
   ServicesDefault:
     - OS::TripleO::Services::Aide
diff --git a/roles/HciCephMon.yaml b/roles/HciCephMon.yaml
index bf1304ae87..402cb84b12 100644
--- a/roles/HciCephMon.yaml
+++ b/roles/HciCephMon.yaml
@@ -9,7 +9,6 @@
     - Tenant
     - Storage
     - StorageMgmt
-  disable_upgrade_deployment: True
   HostnameFormatDefault: '%stackname%-hci-ceph-mon-%index%'
   ServicesDefault:
     - OS::TripleO::Services::Aide
diff --git a/roles/HciCephObject.yaml b/roles/HciCephObject.yaml
index 3820cdcc45..7da1106ab4 100644
--- a/roles/HciCephObject.yaml
+++ b/roles/HciCephObject.yaml
@@ -9,7 +9,6 @@
     - Tenant
     - Storage
     - StorageMgmt
-  disable_upgrade_deployment: True
   HostnameFormatDefault: '%stackname%-hci-ceph-object-%index%'
   ServicesDefault:
     - OS::TripleO::Services::Aide
diff --git a/roles/ObjectStorage.yaml b/roles/ObjectStorage.yaml
index 01ce9c9d05..343212d5f1 100644
--- a/roles/ObjectStorage.yaml
+++ b/roles/ObjectStorage.yaml
@@ -16,7 +16,6 @@
   deprecated_param_image: 'SwiftStorageImage'
   deprecated_param_flavor: 'OvercloudSwiftStorageFlavor'
   deprecated_nic_config_name: 'swift-storage.yaml'
-  disable_upgrade_deployment: True
   ServicesDefault:
     - OS::TripleO::Services::Aide
     - OS::TripleO::Services::AuditD
diff --git a/roles/README.rst b/roles/README.rst
index dbf40a72a7..3294088c40 100644
--- a/roles/README.rst
+++ b/roles/README.rst
@@ -47,10 +47,6 @@ Role Options
 * disable_constraints: (boolean) optional, whether to disable Nova and Glance
   constraints for each role specified in the templates.
 
-* disable_upgrade_deployment: (boolean) optional, whether to run the
-  ansible upgrade steps for all services that are deployed on the role. If set
-  to True, the operator will drive the upgrade for this role's nodes.
-
 * upgrade_batch_size: (number): batch size for upgrades where tasks are
   specified by services to run in batches vs all nodes at once.
   This defaults to 1, but larger batches may be specified here.
diff --git a/roles_data.yaml b/roles_data.yaml
index 026170ccdb..d88e3185ad 100644
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -195,7 +195,6 @@
   deprecated_param_ips: 'NovaComputeIPs'
   deprecated_server_resource_name: 'NovaCompute'
   deprecated_nic_config_name: 'compute.yaml'
-  disable_upgrade_deployment: True
   ServicesDefault:
     - OS::TripleO::Services::Aide
     - OS::TripleO::Services::AuditD
@@ -298,7 +297,6 @@
   deprecated_param_image: 'SwiftStorageImage'
   deprecated_param_flavor: 'OvercloudSwiftStorageFlavor'
   deprecated_nic_config_name: 'swift-storage.yaml'
-  disable_upgrade_deployment: True
   ServicesDefault:
     - OS::TripleO::Services::Aide
     - OS::TripleO::Services::AuditD