We're going to introduce more customization steps that need to
be performed after installing some packages. To avoid hacking
too much around the core issue, just move all environment
customization after package installation and be done with it.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
guests/site.yml | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/guests/site.yml b/guests/site.yml
index a13e0e9..46d2db6 100644
--- a/guests/site.yml
+++ b/guests/site.yml
@@ -31,12 +31,6 @@
project: blacklist
state: absent
- # Configure environment. Needs to happen after installing base packages
- - include: tasks/bootloader.yml
- - include: tasks/services.yml
- - include: tasks/kludges.yml
- - include: tasks/users.yml
-
# Install build dependencies for each project
- include: tasks/packages.yml
with_items:
@@ -53,11 +47,13 @@
when:
- flavor == "jenkins"
+ # Configure environment. Needs to happen after installing packages
+ - include: tasks/bootloader.yml
+ - include: tasks/services.yml
+ - include: tasks/kludges.yml
+ - include: tasks/users.yml
+
# Configure the Jenkins agent
- include: tasks/jenkins.yml
when:
- flavor == 'jenkins'
-
- # Some of the kludges involve tweaking files that are included in
- # the packages we just installed, so go through them again here
- - include: tasks/kludges.yml
--
2.14.3