From 63dac37550bb695232f6cfde7ef6ad26f64c29cb Mon Sep 17 00:00:00 2001 From: Khai Do Date: Wed, 20 Jul 2016 10:16:27 -0700 Subject: [PATCH] Remove puppet for jeepyb's trivial rebase script Change I37337b9d07ace4 disabled the use of jeepyb's trivial rebase script however the puppet for it still exists. There's really no need to keep the option around in the puppet manifest so this change just removes it. Change-Id: I101e385823a110a74b3060ad11e3e528d5048d9f --- modules/openstack_project/manifests/gerrit.pp | 1 - .../templates/gerrit_patchset-created.erb | 7 ------- 2 files changed, 8 deletions(-) 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 \