opendev/system-config
Code Issues Proposed changes

Remove puppet for jeepyb's trivial rebase script

Browse Source 
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
This commit is contained in:
Khai Do 2016-07-20 10:16:27 -07:00
parent f87d71b227
commit 63dac37550
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/openstack_project/manifests/gerrit.pp
View File

@ -53,7 +53,6 @@ class openstack_project::gerrit (
$github_oauth_token = '', $github_oauth_token = '',
$github_project_username = '', $github_project_username = '',
$github_project_password = '', $github_project_password = '',
$trivial_rebase_role_id = '',
$email_private_key = '', $email_private_key = '',
$token_private_key = '', $token_private_key = '',
$replicate_local = true, $replicate_local = true,

7
modules/openstack_project/templates/gerrit_patchset-created.erb
View File

@ -4,13 +4,6 @@
timeout -k 2m 10m /usr/local/bin/update-blueprint patchset-created "$@" 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/update-bug patchset-created "$@"
timeout -k 2m 10m /usr/local/bin/notify-impact patchset-created "$@" --impact SecurityImpact --dest-address 'openstack-security@lists.openstack.org' 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 != "" -%> <% if @ssh_welcome_rsa_key_contents != "" -%>
timeout -k 2m 10m /usr/local/bin/welcome-message patchset-created \ timeout -k 2m 10m /usr/local/bin/welcome-message patchset-created \
--verbose --ssh-user=welcome-message \ --verbose --ssh-user=welcome-message \