[libvirt] [jenkins-ci PATCH 0/2] guests: Install and enable chrony
Time travel is no longer allowed on these premises. Andrea Bolognani (2): guests: Move environment configuration steps together guests: Install and enable chrony guests/site.yml | 7 ++++--- guests/tasks/services.yml | 15 +++++++++++++++ guests/vars/mappings.yml | 3 +++ guests/vars/projects/base.yml | 1 + 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 guests/tasks/services.yml -- 2.14.3
We're going to add more steps that require base packages to be installed soon, so let's group all configuration steps except the very basic one together after base package installation has been performed. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/site.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guests/site.yml b/guests/site.yml index ceaaf25..1b9c180 100644 --- a/guests/site.yml +++ b/guests/site.yml @@ -17,8 +17,6 @@ # Prepare environment. None of the actions performed here might # depend on packages being installed - include: tasks/base.yml - - include: tasks/bootloader.yml - - include: tasks/compat.yml # Install base packages - include: tasks/packages.yml @@ -31,7 +29,9 @@ project: blacklist state: absent - # Create users. This needs to happen after installing base packages + # Configure environment. Needs to happen after installing base packages + - include: tasks/bootloader.yml + - include: tasks/compat.yml - include: tasks/users.yml # Install build dependencies for each project -- 2.14.3
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/site.yml | 1 + guests/tasks/services.yml | 15 +++++++++++++++ guests/vars/mappings.yml | 3 +++ guests/vars/projects/base.yml | 1 + 4 files changed, 20 insertions(+) create mode 100644 guests/tasks/services.yml diff --git a/guests/site.yml b/guests/site.yml index 1b9c180..869291d 100644 --- a/guests/site.yml +++ b/guests/site.yml @@ -31,6 +31,7 @@ # Configure environment. Needs to happen after installing base packages - include: tasks/bootloader.yml + - include: tasks/services.yml - include: tasks/compat.yml - include: tasks/users.yml diff --git a/guests/tasks/services.yml b/guests/tasks/services.yml new file mode 100644 index 0000000..81e282a --- /dev/null +++ b/guests/tasks/services.yml @@ -0,0 +1,15 @@ +--- +- set_fact: + chrony: chrony + +- set_fact: + chrony: chronyd + when: + - package_format != 'deb' + +- name: 'Enable services' + service: + name: '{{ item }}' + enabled: yes + with_items: + - '{{ chrony }}' diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index d94d648..cb44b3d 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -68,6 +68,9 @@ mappings: default: check rpm: check-devel + chrony: + default: chrony + cppi: Fedora: cppi FreeBSD: cppi diff --git a/guests/vars/projects/base.yml b/guests/vars/projects/base.yml index 94644e4..a0483d8 100644 --- a/guests/vars/projects/base.yml +++ b/guests/vars/projects/base.yml @@ -5,6 +5,7 @@ packages: - autopoint - bash - ccache + - chrony - cppi - gcc - gettext -- 2.14.3
participants (2)
-
Andrea Bolognani -
Pavel Hrdina