From nobody Tue Apr 23 13:07:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=patchew-devel-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=patchew-devel-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675763621; cv=none; d=zohomail.com; s=zohoarc; b=WGXbtWLjOLT1aabzl0E0FSzhZefMLlGt14xS9ACBKkTK66xXRfOY0oCdCumuZk9CrArd1IvEo7mUUAHhBBJUeI8LmJIaD9I55O6CTJDRFYJ8M7zVPguGNUcmWbsyyL02fioFA9GLRNbkWd0UJHSAZaM8cq3UWYZYme02YQCw/IE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675763621; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pP3SXg925paMQWhgzmM4Jw2ztgQE4x+K+HbFsNqVa4U=; b=QLh+hg1sgIFFjGKf3IK+y6Jb0IG7LsRaaAuZwvfIoXrU6DwBUdMXfxfNjRa3OYAaQ1C1aFseleXdJkSECFC3ghgOWkokYaAPZ0HQSvPh9LaZ+kaNPKNvq6hooX9FpevJ8U2xKPGwVJpMTG/mht8v82ZXhNIxU3WnFC4UvnWb3SI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=patchew-devel-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1675763621030906.2981569804265; Tue, 7 Feb 2023 01:53:41 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-502-_KBy6YeDMjOxHPOeeOz13Q-1; Tue, 07 Feb 2023 04:53:37 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C273680D0F3; Tue, 7 Feb 2023 09:53:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA2AB40398A0; Tue, 7 Feb 2023 09:53:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5A2E619465A3; Tue, 7 Feb 2023 09:53:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 29F2919465A2 for ; Tue, 7 Feb 2023 09:53:35 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0F59B1121315; Tue, 7 Feb 2023 09:53:35 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast08.extmail.prod.ext.rdu2.redhat.com [10.11.55.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 072511121314 for ; Tue, 7 Feb 2023 09:53:34 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D90B53828884 for ; Tue, 7 Feb 2023 09:53:34 +0000 (UTC) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-257-HWxVRMaiO-SlAlpHCcJV-w-1; Tue, 07 Feb 2023 04:53:33 -0500 Received: by mail-ed1-f69.google.com with SMTP id bq13-20020a056402214d00b004a25d8d7593so9520781edb.0 for ; Tue, 07 Feb 2023 01:53:33 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id v26-20020a17090690da00b0086ffe8a00fdsm6577870ejw.84.2023.02.07.01.53.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 01:53:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675763620; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=pP3SXg925paMQWhgzmM4Jw2ztgQE4x+K+HbFsNqVa4U=; b=CG3pGH31clL/nIeGbp++viRPj0bmof01sbgrDHn2KFCm9iqD7Ce7yhDYjYzFCGBrILYhik zEL8Yfz8rHWdMWOxqLNR5Y2zVTJCe8i49/N7YvNZWN1FA9pguXgpgH80ikp9+PIZwbJD/t Fr/zD+szGB0rwcpUxFSqI9VgcgBCmGo= X-MC-Unique: _KBy6YeDMjOxHPOeeOz13Q-1 X-Original-To: patchew-devel@listman.corp.redhat.com X-MC-Unique: HWxVRMaiO-SlAlpHCcJV-w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KmLwCHtsYSOi4jfI2vqAGvaHHq9OdhmEL69NmWrY2Og=; b=Jk8I+VOwErfhaoBUpacvMdstmmSbWc9zyTkxUK5DhBhS1l2STRz6fr+AJ8wrAQDS0B sVGG2rCCxFJwGqijTXTFGvtR2sEjEUgsCgZaV5beDfyVt6zmv5jwRw8DlkBmu/tEkxbR AkOs8VulOZa71XTVbWfjggfnzHauyMB9eFTyzhiUjcYIBK3v3dKVVgpKe2kxjX5Jo/hf 7d3pPveIMutNScWQAu3ht6nTMehjCtY4ITxo5o7A8ww7VMAmZOsRc/SB8VkF5Y2z28aV NaoT13nS/vr3P2700A9KPx/FPlVnFjhfEOxImd4ZtVdKvjzboA9jrk3H63a0JrNLiGUs crBQ== X-Gm-Message-State: AO0yUKVY9VI3KXzLcNnuen6M7D5qF/02v20DNbJBch/CG+7+4Ly5M51d f+gqyGLr9sWKzpl71b26nwRLJNu6j/6eRPPOpOBcjvmo/l/KG1ySQ/p1yKwxRJuTWI7QszusqmT WLX27GGJ4nntKRJekoen90UhZly05xar80Q1++D8AHQNjTQZ4KaIhIvnAI+J+nIY0RNeYSIrgRT HNm7w= X-Received: by 2002:a17:906:30cd:b0:88d:d304:3423 with SMTP id b13-20020a17090630cd00b0088dd3043423mr2588752ejb.70.1675763611946; Tue, 07 Feb 2023 01:53:31 -0800 (PST) X-Google-Smtp-Source: AK7set/M9iQlZzgUU0SnRHiKZSdJpTQb4FjgNKjvaC7ByuGel+1f5SVgEs2Ua01aOziaUnJVvNIoqA== X-Received: by 2002:a17:906:30cd:b0:88d:d304:3423 with SMTP id b13-20020a17090630cd00b0088dd3043423mr2588739ejb.70.1675763611636; Tue, 07 Feb 2023 01:53:31 -0800 (PST) From: Paolo Bonzini To: patchew-devel@redhat.com Date: Tue, 7 Feb 2023 10:53:17 +0100 Message-Id: <20230207095318.57814-5-pbonzini@redhat.com> In-Reply-To: <20230207095318.57814-1-pbonzini@redhat.com> References: <20230207095318.57814-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Subject: [Patchew-devel] [PATCH 4/5] playbooks: allow specifying custom container root X-BeenThere: patchew-devel@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Patchew development and discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: patchew-devel-bounces@redhat.com Sender: "Patchew-devel" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675763623097100007 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- scripts/playbooks/deploy-appliers.yml | 6 +++++- scripts/playbooks/deploy-db.yml | 6 +++++- scripts/playbooks/deploy-importers-lore.yml | 6 +++++- scripts/playbooks/deploy-importers.yml | 6 +++++- scripts/playbooks/deploy-servers.yml | 6 +++++- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/scripts/playbooks/deploy-appliers.yml b/scripts/playbooks/depl= oy-appliers.yml index 18edac7..fa5118e 100644 --- a/scripts/playbooks/deploy-appliers.yml +++ b/scripts/playbooks/deploy-appliers.yml @@ -4,6 +4,10 @@ prompt: "The instance name" default: patchew-applier private: no + - name: container_dir + prompt: "The base directory for the container" + default: /data + private: no - name: "patchew_server" prompt: "The address of patchew server" default: "https://patchew.org" @@ -23,7 +27,7 @@ default: "" private: no vars: - base_dir: "/data/{{ instance_name }}" + base_dir: "{{ container_dir }}/{{ instance_name }}" src_dir: "{{ base_dir }}/src" data_dir: "{{ base_dir }}/data" config_file: "{{ data_dir }}/config" diff --git a/scripts/playbooks/deploy-db.yml b/scripts/playbooks/deploy-db.= yml index 2b69995..2bb514f 100644 --- a/scripts/playbooks/deploy-db.yml +++ b/scripts/playbooks/deploy-db.yml @@ -4,8 +4,12 @@ prompt: "Instance name of the patchew postgres db" default: patchew-server-db private: no + - name: container_dir + prompt: "The base directory for the container" + default: /data + private: no vars: - base_dir: "/data/{{ instance_name }}" + base_dir: "{{ container_dir }}/{{ instance_name }}" src_dir: "{{ base_dir }}/src" data_dir: "{{ base_dir }}/data" tasks: diff --git a/scripts/playbooks/deploy-importers-lore.yml b/scripts/playbook= s/deploy-importers-lore.yml index 9f80d93..0ccbf8e 100644 --- a/scripts/playbooks/deploy-importers-lore.yml +++ b/scripts/playbooks/deploy-importers-lore.yml @@ -4,6 +4,10 @@ prompt: "The instance name" default: patchew-importer-lore private: no + - name: container_dir + prompt: "The base directory for the container" + default: /data + private: no - name: "patchew_server" prompt: "The address of patchew server" default: "https://patchew.org" @@ -20,7 +24,7 @@ default: "https://lore.kernel.org/lkml/" private: no vars: - base_dir: "/data/{{ instance_name }}" + base_dir: "{{ container_dir }}/{{ instance_name }}" src_dir: "{{ base_dir }}/src" data_dir: "{{ base_dir }}/data" config_file: "{{ data_dir }}/config" diff --git a/scripts/playbooks/deploy-importers.yml b/scripts/playbooks/dep= loy-importers.yml index 8d362ee..1ef6c80 100644 --- a/scripts/playbooks/deploy-importers.yml +++ b/scripts/playbooks/deploy-importers.yml @@ -4,6 +4,10 @@ prompt: "The instance name" default: patchew-importer private: no + - name: container_dir + prompt: "The base directory for the container" + default: /data + private: no - name: "patchew_server" prompt: "The address of patchew server" default: "https://patchew.org" @@ -41,7 +45,7 @@ default: "y" private: no vars: - base_dir: "/data/{{ instance_name }}" + base_dir: "{{ container_dir }}/{{ instance_name }}" src_dir: "{{ base_dir }}/src" data_dir: "{{ base_dir }}/data" config_file: "{{ data_dir }}/config" diff --git a/scripts/playbooks/deploy-servers.yml b/scripts/playbooks/deplo= y-servers.yml index 12cddb8..bf709a0 100644 --- a/scripts/playbooks/deploy-servers.yml +++ b/scripts/playbooks/deploy-servers.yml @@ -4,6 +4,10 @@ prompt: "Instance name of the webserver" default: patchew-server private: no + - name: container_dir + prompt: "The base directory for the container" + default: /data + private: no - name: db_host prompt: "Host for PostgreSQL database (empty =3D SQLite)" default: "" @@ -17,7 +21,7 @@ default: "adminpass" private: yes vars: - base_dir: "/data/{{ instance_name }}" + base_dir: "{{ container_dir }}/{{ instance_name }}" src_dir: "{{ base_dir }}/src" data_dir: "{{ base_dir }}/data" db_arg: "{{ '-e PATCHEW_DB_PORT_5432_TCP_ADDR=3D' if db_host !=3D '' e= lse '' }}{{ db_host }}" --=20 2.38.1 _______________________________________________ Patchew-devel mailing list Patchew-devel@redhat.com https://listman.redhat.com/mailman/listinfo/patchew-devel