From e6d98f0181c0962ca87ec952360d406011c8eb88 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sat, 21 Mar 2020 11:12:44 -0500 Subject: [PATCH] Install utility scripts for running jeepyb commands jeepyb is installed in the gerrit image because of hook scripts. To run manage-projects and track-upstream, make wrapper scripts in /usr/local that runs the commands from in the container image bind-mounting the appropriate dirs and files into the container. Change-Id: I7ef1f00e69d4c310d69d83c80ca210e8f340878d --- .../host_vars/review-dev01.opendev.org.yaml | 1 + playbooks/roles/gerrit/defaults/main.yaml | 1 + playbooks/roles/gerrit/tasks/main.yaml | 11 ++++++++ .../roles/gerrit/templates/manage-projects.j2 | 25 +++++++++++++++++++ .../roles/gerrit/templates/projects.ini.j2 | 10 ++++++++ .../roles/gerrit/templates/track-upstream.j2 | 25 +++++++++++++++++++ 6 files changed, 73 insertions(+) create mode 100644 playbooks/roles/gerrit/templates/manage-projects.j2 create mode 100644 playbooks/roles/gerrit/templates/projects.ini.j2 create mode 100644 playbooks/roles/gerrit/templates/track-upstream.j2 diff --git a/playbooks/host_vars/review-dev01.opendev.org.yaml b/playbooks/host_vars/review-dev01.opendev.org.yaml index a3f4b1f044..541653da9d 100644 --- a/playbooks/host_vars/review-dev01.opendev.org.yaml +++ b/playbooks/host_vars/review-dev01.opendev.org.yaml @@ -11,3 +11,4 @@ gerrit_storyboard_url: https://storyboard-dev.openstack.org gerrit_vhost_name: review-dev.opendev.org gerrit_redirect_vhost: review-dev.openstack.org gerrit_project_config_base: /opt/project-config/dev +gerrit_project_creator_user: openstack-dev-project-creator diff --git a/playbooks/roles/gerrit/defaults/main.yaml b/playbooks/roles/gerrit/defaults/main.yaml index 6d84d8c691..2ae9a0d5d4 100644 --- a/playbooks/roles/gerrit/defaults/main.yaml +++ b/playbooks/roles/gerrit/defaults/main.yaml @@ -18,3 +18,4 @@ gerrit_container_volumes: - /home/gerrit2/.ssh:/var/gerrit/.ssh gerrit_database_type: MYSQL gerrit_project_config_base: /opt/project-config +gerrit_project_creator_user: openstack-project-creator diff --git a/playbooks/roles/gerrit/tasks/main.yaml b/playbooks/roles/gerrit/tasks/main.yaml index 3629427751..17287ea6ba 100644 --- a/playbooks/roles/gerrit/tasks/main.yaml +++ b/playbooks/roles/gerrit/tasks/main.yaml @@ -233,6 +233,17 @@ - etc/GerritSite.css - etc/GerritSiteHeader.html +- name: Write jeepyb utility scripts + template: + src: "{{ item }}.j2" + dest: "/usr/local/bin/{{ item }}" + owner: root + group: root + mode: 0755 + loop: + - manage-projects + - track-upstream + - name: Install apache2 apt: name: diff --git a/playbooks/roles/gerrit/templates/manage-projects.j2 b/playbooks/roles/gerrit/templates/manage-projects.j2 new file mode 100644 index 0000000000..7a8a027888 --- /dev/null +++ b/playbooks/roles/gerrit/templates/manage-projects.j2 @@ -0,0 +1,25 @@ +#!/bin/bash +# Copyright 2020 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +exec docker run -it --rm -u root \ + -v{{ gerrit_project_config_base }}:/opt/project-config \ + -v{{ gerrit_project_config_base }}/gerrit/projects.yaml:/home/gerrit2/projects.yaml \ + -v/opt/lib/git:/opt/lib/git \ + -v/opt/lib/jeepyb:/opt/lib/jeepyb \ + -v/home/gerrit2/review_site/etc/ssh_project_rsa_key:/home/gerrit2/review_site/etc/ssh_project_rsa_key \ + -v/home/gerrit2/projects.ini:/home/gerrit2/projects.ini \ + -v/var/log:/var/log \ + {{ gerrit_container_image }} manage-projects -v -l /var/log/manage_projects.log diff --git a/playbooks/roles/gerrit/templates/projects.ini.j2 b/playbooks/roles/gerrit/templates/projects.ini.j2 new file mode 100644 index 0000000000..20b0d505d6 --- /dev/null +++ b/playbooks/roles/gerrit/templates/projects.ini.j2 @@ -0,0 +1,10 @@ +[projects] +homepage=https://opendev.org +acl-dir=/opt/project-config/gerrit/acls +local-git-dir=/opt/lib/git +jeepyb-cache-dir=/opt/lib/jeepyb +gerrit-host={{ gerrit_vhost_name }} +gerrit-user={{ gerrit_project_creator_user }} +gerrit-committer=OpenDev Project Creator +gerrit-key=/home/gerrit2/review_site/etc/ssh_project_rsa_key +has-github=false diff --git a/playbooks/roles/gerrit/templates/track-upstream.j2 b/playbooks/roles/gerrit/templates/track-upstream.j2 new file mode 100644 index 0000000000..c37eade95a --- /dev/null +++ b/playbooks/roles/gerrit/templates/track-upstream.j2 @@ -0,0 +1,25 @@ +#!/bin/bash +# Copyright 2020 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +exec docker run -it --rm -u root \ + -v{{ gerrit_project_config_base }}:/opt/project-config \ + -v{{ gerrit_project_config_base }}/gerrit/projects.yaml:/home/gerrit2/projects.yaml \ + -v/opt/lib/git:/opt/lib/git \ + -v/opt/lib/jeepyb:/opt/lib/jeepyb \ + -v/home/gerrit2/review_site/etc/ssh_project_rsa_key:/home/gerrit2/review_site/etc/ssh_project_rsa_key \ + -v/home/gerrit2/projects.ini:/home/gerrit2/projects.ini \ + -v/var/log:/var/log \ + {{ gerrit_container_image }} track-upstream -v -l /var/log/track_upstream.log