Merge "Set env vars pointing to correct file locations"

playbooks/roles/gerrit/defaults/main.yaml

@@ -17,6 +17,8 @@ gerrit_container_volumes:
   - /home/gerrit2/review_site/static:/var/gerrit/static
   - /home/gerrit2/.launchpadlib:/var/gerrit/.launchpadlib
   - /home/gerrit2/.ssh:/var/gerrit/.ssh
+  - '{{ gerrit_project_config_base }}/gerrit/projects.yaml:/var/gerrit/etc/projects.yaml'
+  - '{{ gerrit_project_config_base }}/gerrit/projects.ini:/var/gerrit/etc/projects.ini'
 gerrit_database_type: MYSQL
 gerrit_project_config_base: /opt/project-config
 gerrit_project_creator_user: openstack-project-creator

playbooks/roles/gerrit/files/hooks/change-abandoned

@@ -1,4 +1,9 @@
 #!/bin/sh
 
+export GERRIT_GIT_DIR=/var/gerrit/git
+export GERRIT_CONFIG=/var/gerrit/etc/gerrit.config
+export GERRIT_SECURE_CONFIG=/var/gerrit/etc/secure.config
+export PROJECTS_YAML=/var/gerrit/etc/projects.yaml
+export PROJECTS_INI=/var/gerrit/etc/projects.ini
 # Use timeout to kill any process running longer than 10 minutes.
 timeout -k 2m 10m /usr/local/bin/update-bug change-abandoned "$@"

playbooks/roles/gerrit/files/hooks/change-merged

@@ -1,4 +1,9 @@
 #!/bin/sh
 
+export GERRIT_GIT_DIR=/var/gerrit/git
+export GERRIT_CONFIG=/var/gerrit/etc/gerrit.config
+export GERRIT_SECURE_CONFIG=/var/gerrit/etc/secure.config
+export PROJECTS_YAML=/var/gerrit/etc/projects.yaml
+export PROJECTS_INI=/var/gerrit/etc/projects.ini
 # Use timeout to kill any process running longer than 10 minutes.
 timeout -k 2m 10m /usr/local/bin/update-bug change-merged "$@"

playbooks/roles/gerrit/files/hooks/patchset-created

@@ -1,11 +1,17 @@
 #!/bin/sh
 
+export GERRIT_GIT_DIR=/var/gerrit/git
+export GERRIT_CONFIG=/var/gerrit/etc/gerrit.config
+export GERRIT_SECURE_CONFIG=/var/gerrit/etc/secure.config
+export PROJECTS_YAML=/var/gerrit/etc/projects.yaml
+export PROJECTS_INI=/var/gerrit/etc/projects.ini
+
 # Use timeout to kill any process running longer than 10 minutes.
 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 welcome_message_gerrit_ssh_private_key is defined %}
+if [ -f /var/gerrit/etc/ssh_welcome_rsa_key ] ; then
 timeout -k 2m 10m /usr/local/bin/welcome-message patchset-created \
     --verbose --ssh-user=welcome-message \
     --ssh-key=/var/gerrit/etc/ssh_welcome_rsa_key "$@"
-{% endif %}
+fi

playbooks/roles/gerrit/tasks/main.yaml

@@ -209,14 +209,6 @@
     group: "{{ gerrit_user_name }}"
     mode: 0444
 
-- name: Install patchset-created hook
-  template:
-    src: patchset-created.j2
-    dest: "{{ gerrit_site_dir }}/hooks/patchset-created"
-    owner: "{{ gerrit_user_name }}"
-    group: "{{ gerrit_user_name }}"
-    mode: 0555
-
 # TODO(mordred) These things should really go into the image instead.
 - name: Copy static and etc
   copy: