[libvirt] [jenkins-ci PATCH 4/8] guests: Move update playbook and related resources

This has two advantages: it unclutters the top-level directory, and opens the door for adding more playbooks down the line without turning it into a mess. Thanks to the changes made earlier, moving the playbook is almost entirely transparent to lcitool. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- guests/lcitool | 4 ++-- guests/{site.yml => playbooks/update/main.yml} | 0 guests/{ => playbooks/update}/tasks/base.yml | 0 guests/{ => playbooks/update}/tasks/bootloader.yml | 0 guests/{ => playbooks/update}/tasks/bootstrap.yml | 0 guests/{ => playbooks/update}/tasks/jenkins.yml | 0 guests/{ => playbooks/update}/tasks/kludges.yml | 0 guests/{ => playbooks/update}/tasks/packages.yml | 0 guests/{ => playbooks/update}/tasks/paths.yml | 0 guests/{ => playbooks/update}/tasks/services.yml | 0 guests/{ => playbooks/update}/tasks/users.yml | 0 guests/{ => playbooks/update}/templates/bash_profile.j2 | 0 guests/{ => playbooks/update}/templates/bashrc.j2 | 0 guests/{ => playbooks/update}/templates/ccache.conf.j2 | 0 .../update}/templates/fedora-rawhide-kernel-nodebug.repo.j2 | 0 guests/{ => playbooks/update}/templates/jenkins.service.j2 | 0 .../update}/templates/jessie-backports.preferences.j2 | 0 .../update}/templates/jessie-backports.sources.j2 | 0 18 files changed, 2 insertions(+), 2 deletions(-) rename guests/{site.yml => playbooks/update/main.yml} (100%) rename guests/{ => playbooks/update}/tasks/base.yml (100%) rename guests/{ => playbooks/update}/tasks/bootloader.yml (100%) rename guests/{ => playbooks/update}/tasks/bootstrap.yml (100%) rename guests/{ => playbooks/update}/tasks/jenkins.yml (100%) rename guests/{ => playbooks/update}/tasks/kludges.yml (100%) rename guests/{ => playbooks/update}/tasks/packages.yml (100%) rename guests/{ => playbooks/update}/tasks/paths.yml (100%) rename guests/{ => playbooks/update}/tasks/services.yml (100%) rename guests/{ => playbooks/update}/tasks/users.yml (100%) rename guests/{ => playbooks/update}/templates/bash_profile.j2 (100%) rename guests/{ => playbooks/update}/templates/bashrc.j2 (100%) rename guests/{ => playbooks/update}/templates/ccache.conf.j2 (100%) rename guests/{ => playbooks/update}/templates/fedora-rawhide-kernel-nodebug.repo.j2 (100%) rename guests/{ => playbooks/update}/templates/jenkins.service.j2 (100%) rename guests/{ => playbooks/update}/templates/jessie-backports.preferences.j2 (100%) rename guests/{ => playbooks/update}/templates/jessie-backports.sources.j2 (100%) diff --git a/guests/lcitool b/guests/lcitool index 206a014..2cfb0e9 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -431,8 +431,8 @@ class Application: ansible_hosts = ",".join(self._inventory.expand_pattern(hosts)) ansible_cfg_path = os.path.join(base, "ansible.cfg") - playbook_base = base - playbook_path = os.path.join(playbook_base, "site.yml") + playbook_base = os.path.join(base, "playbooks", "update") + playbook_path = os.path.join(playbook_base, "main.yml") extra_vars = json.dumps({ "base": base, diff --git a/guests/site.yml b/guests/playbooks/update/main.yml similarity index 100% rename from guests/site.yml rename to guests/playbooks/update/main.yml diff --git a/guests/tasks/base.yml b/guests/playbooks/update/tasks/base.yml similarity index 100% rename from guests/tasks/base.yml rename to guests/playbooks/update/tasks/base.yml diff --git a/guests/tasks/bootloader.yml b/guests/playbooks/update/tasks/bootloader.yml similarity index 100% rename from guests/tasks/bootloader.yml rename to guests/playbooks/update/tasks/bootloader.yml diff --git a/guests/tasks/bootstrap.yml b/guests/playbooks/update/tasks/bootstrap.yml similarity index 100% rename from guests/tasks/bootstrap.yml rename to guests/playbooks/update/tasks/bootstrap.yml diff --git a/guests/tasks/jenkins.yml b/guests/playbooks/update/tasks/jenkins.yml similarity index 100% rename from guests/tasks/jenkins.yml rename to guests/playbooks/update/tasks/jenkins.yml diff --git a/guests/tasks/kludges.yml b/guests/playbooks/update/tasks/kludges.yml similarity index 100% rename from guests/tasks/kludges.yml rename to guests/playbooks/update/tasks/kludges.yml diff --git a/guests/tasks/packages.yml b/guests/playbooks/update/tasks/packages.yml similarity index 100% rename from guests/tasks/packages.yml rename to guests/playbooks/update/tasks/packages.yml diff --git a/guests/tasks/paths.yml b/guests/playbooks/update/tasks/paths.yml similarity index 100% rename from guests/tasks/paths.yml rename to guests/playbooks/update/tasks/paths.yml diff --git a/guests/tasks/services.yml b/guests/playbooks/update/tasks/services.yml similarity index 100% rename from guests/tasks/services.yml rename to guests/playbooks/update/tasks/services.yml diff --git a/guests/tasks/users.yml b/guests/playbooks/update/tasks/users.yml similarity index 100% rename from guests/tasks/users.yml rename to guests/playbooks/update/tasks/users.yml diff --git a/guests/templates/bash_profile.j2 b/guests/playbooks/update/templates/bash_profile.j2 similarity index 100% rename from guests/templates/bash_profile.j2 rename to guests/playbooks/update/templates/bash_profile.j2 diff --git a/guests/templates/bashrc.j2 b/guests/playbooks/update/templates/bashrc.j2 similarity index 100% rename from guests/templates/bashrc.j2 rename to guests/playbooks/update/templates/bashrc.j2 diff --git a/guests/templates/ccache.conf.j2 b/guests/playbooks/update/templates/ccache.conf.j2 similarity index 100% rename from guests/templates/ccache.conf.j2 rename to guests/playbooks/update/templates/ccache.conf.j2 diff --git a/guests/templates/fedora-rawhide-kernel-nodebug.repo.j2 b/guests/playbooks/update/templates/fedora-rawhide-kernel-nodebug.repo.j2 similarity index 100% rename from guests/templates/fedora-rawhide-kernel-nodebug.repo.j2 rename to guests/playbooks/update/templates/fedora-rawhide-kernel-nodebug.repo.j2 diff --git a/guests/templates/jenkins.service.j2 b/guests/playbooks/update/templates/jenkins.service.j2 similarity index 100% rename from guests/templates/jenkins.service.j2 rename to guests/playbooks/update/templates/jenkins.service.j2 diff --git a/guests/templates/jessie-backports.preferences.j2 b/guests/playbooks/update/templates/jessie-backports.preferences.j2 similarity index 100% rename from guests/templates/jessie-backports.preferences.j2 rename to guests/playbooks/update/templates/jessie-backports.preferences.j2 diff --git a/guests/templates/jessie-backports.sources.j2 b/guests/playbooks/update/templates/jessie-backports.sources.j2 similarity index 100% rename from guests/templates/jessie-backports.sources.j2 rename to guests/playbooks/update/templates/jessie-backports.sources.j2 -- 2.17.1