From nobody Mon Feb 9 14:33:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1532017943661656.1115180623538; Thu, 19 Jul 2018 09:32:23 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BE44C30832F5; Thu, 19 Jul 2018 16:32:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 738B8194A9; Thu, 19 Jul 2018 16:32:21 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1783524602; Thu, 19 Jul 2018 16:32:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JGWH4P003727 for ; Thu, 19 Jul 2018 12:32:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4DFE51C5B7; Thu, 19 Jul 2018 16:32:17 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E3F731C5BC for ; Thu, 19 Jul 2018 16:32:16 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 18:32:03 +0200 Message-Id: <20180719163208.23126-4-abologna@redhat.com> In-Reply-To: <20180719163208.23126-1-abologna@redhat.com> References: <20180719163208.23126-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 3/8] lcitool: Pass base and playbook_base to Ansible X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 19 Jul 2018 16:32:22 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We want to get rid of relative paths in playbooks and tasks, and in order to do that we have to provide Ansible with some more information. base is the directory where lcitool lives, and playbook_base is the directory where a playbook should look for its private resources: they match for the time being, but that will no longer be the case very shortly. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- guests/lcitool | 5 ++++- guests/site.yml | 26 +++++++++++++------------- guests/tasks/base.yml | 6 +++--- guests/tasks/jenkins.yml | 4 ++-- guests/tasks/packages.yml | 2 +- guests/tasks/users.yml | 4 ++-- 6 files changed, 25 insertions(+), 22 deletions(-) diff --git a/guests/lcitool b/guests/lcitool index 4acb076..206a014 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -431,9 +431,12 @@ class Application: ansible_hosts =3D ",".join(self._inventory.expand_pattern(hosts)) =20 ansible_cfg_path =3D os.path.join(base, "ansible.cfg") - playbook_path =3D os.path.join(base, "site.yml") + playbook_base =3D base + playbook_path =3D os.path.join(playbook_base, "site.yml") =20 extra_vars =3D json.dumps({ + "base": base, + "playbook_base": playbook_base, "root_password_file": root_pass_file, "flavor": flavor, }) diff --git a/guests/site.yml b/guests/site.yml index 063b0c6..4de759b 100644 --- a/guests/site.yml +++ b/guests/site.yml @@ -6,33 +6,33 @@ tasks: =20 # Bootstrap Ansible itself - - include: tasks/bootstrap.yml + - include: '{{ playbook_base }}/tasks/bootstrap.yml' =20 - hosts: all remote_user: root =20 vars_files: - - vars/mappings.yml + - '{{ base }}/vars/mappings.yml' =20 tasks: =20 # Prepare environment. None of the actions performed here might # depend on packages being installed - - include: tasks/base.yml + - include: '{{ playbook_base }}/tasks/base.yml' =20 # Install base packages - - include: tasks/packages.yml + - include: '{{ playbook_base }}/tasks/packages.yml' vars: project: base =20 # Remove blacklisted packages - - include: tasks/packages.yml + - include: '{{ playbook_base }}/tasks/packages.yml' vars: project: blacklist state: absent =20 # Install build dependencies for each project - - include: tasks/packages.yml + - include: '{{ playbook_base }}/tasks/packages.yml' with_items: '{{ projects }}' loop_control: @@ -41,20 +41,20 @@ - projects is defined =20 # Install packages needed for the Jenkins agent - - include: tasks/packages.yml + - include: '{{ playbook_base }}/tasks/packages.yml' vars: project: jenkins when: - flavor =3D=3D "jenkins" =20 # Configure environment. Needs to happen after installing packages - - include: tasks/paths.yml - - include: tasks/bootloader.yml - - include: tasks/services.yml - - include: tasks/kludges.yml - - include: tasks/users.yml + - include: '{{ playbook_base }}/tasks/paths.yml' + - include: '{{ playbook_base }}/tasks/bootloader.yml' + - include: '{{ playbook_base }}/tasks/services.yml' + - include: '{{ playbook_base }}/tasks/kludges.yml' + - include: '{{ playbook_base }}/tasks/users.yml' =20 # Configure the Jenkins agent - - include: tasks/jenkins.yml + - include: '{{ playbook_base }}/tasks/jenkins.yml' when: - flavor =3D=3D 'jenkins' diff --git a/guests/tasks/base.yml b/guests/tasks/base.yml index 6310d96..11f600f 100644 --- a/guests/tasks/base.yml +++ b/guests/tasks/base.yml @@ -25,7 +25,7 @@ =20 - name: Enable jessie-backports repository template: - src: templates/jessie-backports.sources.j2 + src: '{{ playbook_base }}/templates/jessie-backports.sources.j2' dest: /etc/apt/sources.list.d/jessie-backports.list owner: root group: root @@ -36,7 +36,7 @@ =20 - name: Configure APT pinning for jessie-backports template: - src: templates/jessie-backports.preferences.j2 + src: '{{ playbook_base }}/templates/jessie-backports.preferences.j2' dest: /etc/apt/preferences.d/jessie-backports owner: root group: root @@ -47,7 +47,7 @@ =20 - name: Enable fedora-rawhide-kernel-nodebug repository template: - src: templates/fedora-rawhide-kernel-nodebug.repo.j2 + src: '{{ playbook_base }}/templates/fedora-rawhide-kernel-nodebug.repo= .j2' dest: /etc/yum.repos.d/fedora-rawhide-kernel-nodebug.repo owner: root group: root diff --git a/guests/tasks/jenkins.yml b/guests/tasks/jenkins.yml index 9076c34..479e5d6 100644 --- a/guests/tasks/jenkins.yml +++ b/guests/tasks/jenkins.yml @@ -1,7 +1,7 @@ --- - name: Open vault include_vars: - file: vars/vault.yml + file: '{{ base }}/vars/vault.yml' =20 - name: Look up Jenkins secret set_fact: @@ -32,7 +32,7 @@ =20 - name: Configure Jenkins agent template: - src: templates/jenkins.service.j2 + src: '{{ playbook_base }}/templates/jenkins.service.j2' dest: /etc/systemd/system/jenkins.service when: - jenkins_secret is defined diff --git a/guests/tasks/packages.yml b/guests/tasks/packages.yml index 718ef47..a725b07 100644 --- a/guests/tasks/packages.yml +++ b/guests/tasks/packages.yml @@ -7,7 +7,7 @@ =20 - name: '{{ project }}: Load variables' include_vars: - file: 'vars/projects/{{ project }}.yml' + file: '{{ base }}/vars/projects/{{ project }}.yml' =20 - set_fact: temp: {} diff --git a/guests/tasks/users.yml b/guests/tasks/users.yml index dd6c39d..ec7f798 100644 --- a/guests/tasks/users.yml +++ b/guests/tasks/users.yml @@ -61,7 +61,7 @@ =20 - name: '{{ flavor }}: Configure ccache' template: - src: templates/ccache.conf.j2 + src: '{{ playbook_base }}/templates/ccache.conf.j2' dest: /home/{{ flavor }}/.ccache/ccache.conf owner: '{{ flavor }}' group: '{{ flavor }}' @@ -96,7 +96,7 @@ =20 - name: '{{ flavor }}: Create shell profile' template: - src: templates/{{ item }}.j2 + src: '{{ playbook_base }}/templates/{{ item }}.j2' dest: /home/{{ flavor }}/.{{ item }} owner: '{{ flavor }}' group: '{{ flavor }}' --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list