diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index d48387c2a7..c111da7ead 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -200,6 +200,7 @@ resource_registry:
   OS::TripleO::Services::Ntp: puppet/services/time/ntp.yaml
   OS::TripleO::Services::ContainersLogrotateCrond: OS::Heat::None
   OS::TripleO::Services::SwiftProxy: puppet/services/swift-proxy.yaml
+  OS::TripleO::Services::SwiftDispersion: puppet/services/swift-dispersion.yaml
   OS::TripleO::Services::ExternalSwiftProxy: OS::Heat::None
   OS::TripleO::Services::SwiftStorage: puppet/services/swift-storage.yaml
   OS::TripleO::Services::SwiftRingBuilder: puppet/services/swift-ringbuilder.yaml
diff --git a/puppet/services/swift-dispersion.yaml b/puppet/services/swift-dispersion.yaml
new file mode 100644
index 0000000000..3d8514a58e
--- /dev/null
+++ b/puppet/services/swift-dispersion.yaml
@@ -0,0 +1,50 @@
+heat_template_version: pike
+
+description: >
+  OpenStack Swift dispersion tool configured with Puppet
+
+parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  SwiftPassword:
+    description: The password for the swift service account
+    type: string
+    hidden: true
+
+outputs:
+  role_data:
+    description: Role data for the Swift dispersion tool.
+    value:
+      service_name: swift_dispersion
+      config_settings:
+        swift::dispersion::auth_version: 3
+        swift::dispersion::auth_user: swift
+        swift::dispersion::auth_tenant: service
+        swift::dispersion::auth_pass: {get_param: SwiftPassword}
+        swift::dispersion::auth_url: {get_param: [EndpointMap, KeystoneV3Internal, uri]}
+      step_config: |
+        include ::tripleo::profile::base::swift::dispersion
diff --git a/roles/Controller.yaml b/roles/Controller.yaml
index 88e4dfedd3..2dfd50ed07 100644
--- a/roles/Controller.yaml
+++ b/roles/Controller.yaml
@@ -136,6 +136,7 @@
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::SwiftProxy
+    - OS::TripleO::Services::SwiftDispersion
     - OS::TripleO::Services::SwiftRingBuilder
     - OS::TripleO::Services::SwiftStorage
     - OS::TripleO::Services::Tacker
diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml
index 066962c190..6b409617f5 100644
--- a/roles/ControllerOpenstack.yaml
+++ b/roles/ControllerOpenstack.yaml
@@ -102,6 +102,7 @@
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::SwiftProxy
+    - OS::TripleO::Services::SwiftDispersion
     - OS::TripleO::Services::SwiftRingBuilder
     - OS::TripleO::Services::SwiftStorage
     - OS::TripleO::Services::Tacker
diff --git a/roles_data.yaml b/roles_data.yaml
index fe2d27f99c..596112fa32 100644
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -139,6 +139,7 @@
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::SwiftProxy
+    - OS::TripleO::Services::SwiftDispersion
     - OS::TripleO::Services::SwiftRingBuilder
     - OS::TripleO::Services::SwiftStorage
     - OS::TripleO::Services::Tacker