diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index bf551226b2..d0078c4cbf 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -53,7 +53,6 @@ class openstack_project::gerrit (
   $github_oauth_token = '',
   $github_project_username = '',
   $github_project_password = '',
-  $trivial_rebase_role_id = '',
   $email_private_key = '',
   $token_private_key = '',
   $replicate_local = true,
diff --git a/modules/openstack_project/templates/gerrit_patchset-created.erb b/modules/openstack_project/templates/gerrit_patchset-created.erb
index 29d23be699..7c43d3daa0 100755
--- a/modules/openstack_project/templates/gerrit_patchset-created.erb
+++ b/modules/openstack_project/templates/gerrit_patchset-created.erb
@@ -4,13 +4,6 @@
 timeout -k 2m 10m /usr/local/bin/update-blueprint patchset-created "$@"
 timeout -k 2m 10m /usr/local/bin/update-bug patchset-created "$@"
 timeout -k 2m 10m /usr/local/bin/notify-impact patchset-created "$@" --impact SecurityImpact --dest-address 'openstack-security@lists.openstack.org'
-<% if @trivial_rebase_role_id != "" -%>
-timeout -k 2m 10m /usr/local/bin/trivial-rebase \
-    patchset-created \
-    --whitespace \
-    --private-key-path=<%= @ssh_host_key %> \
-    --role-user=<%= @trivial_rebase_role_id %> "$@"
-<% end -%>
 <% if @ssh_welcome_rsa_key_contents != "" -%>
 timeout -k 2m 10m /usr/local/bin/welcome-message patchset-created \
     --verbose --ssh-user=welcome-message \