Merge pull request #779 from kshtsk/wip-testnode-time-sync

Don't even try hwclock time sync on  testnode if node is kvm

Author: djgalloway

roles/common/tasks/apt_systems.yml

@@ -6,6 +6,14 @@
   tags:
     - timezone
 
+- name: Set the timezone for apt systems
+  command: timedatectl set-timezone {{ timezone }}
+  when:
+    - current_tz.stdout|default("") != timezone
+    - ansible_distribution_major_version|int >= 20
+  tags:
+    - timezone
+
 - name: Set the timezone in /etc/timezone
   copy:
     content: "{{ timezone }}"
@@ -14,14 +22,18 @@
     group: root
     mode: 0644
   # Default is used below to avoid breaking check mode
-  when: current_tz.stdout|default("") != timezone
+  when:
+    - current_tz.stdout|default("") != timezone
+    - ansible_distribution_major_version|int < 20
   register: etc_timezone
   tags:
     - timezone
 
 - name: Inform the OS of the new timezone
   command: dpkg-reconfigure --frontend noninteractive tzdata
-  when: etc_timezone is changed
+  when:
+    - etc_timezone is changed
+    - ansible_distribution_major_version|int < 20
   tags:
     - timezone
 

roles/common/tasks/main.yml

@@ -25,8 +25,15 @@
 - import_tasks: zypper_systems.yml
   when: ansible_pkg_mgr == "zypper"
 
+- name: Capture current_clocksource content
+  shell: "cat /sys/devices/system/clocksource/clocksource0/current_clocksource"
+  failed_when: false
+  register: current_clocksource
+
 - name: Set the hardware clock
   command: hwclock --systohc
+  # unless system clock is using kvm-clock
+  when: current_clocksource.stdout.find('kvm-clock') == -1
   tags:
     - timezone
 

roles/testnode/tasks/pip.yml

@@ -23,7 +23,8 @@
     name: "{{ pip_version }}"
     state: present
     enablerepo: epel
-  when: ansible_pkg_mgr == "yum" and ansible_distribution != 'Fedora'
+  when: (ansible_pkg_mgr == "yum" and ansible_distribution != 'Fedora') or
+        (ansible_pkg_mgr == "dnf" and ansible_distribution != 'Fedora')
 
 - name: Install python-pip on apt based systems.
   apt: