preflight: chrony missing in Ubuntu prerequisites

Also modify tox.ini to be able to update packages on rhel and ubuntu based OS Signed-off-by: Teoman ONAY <[email protected]> (cherry picked from commit 807bc9c) # Conflicts: # tox.ini
ceph · Dec 6, 2023 · 637f15c · 637f15c
1 parent ad42894
commit 637f15c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/cephadm-preflight.yml b/cephadm-preflight.yml
@@ -257,12 +257,18 @@
 
         - name: install prerequisites packages
           apt:
-            name: "{{ ['python3','cephadm','ceph-common'] }}"
+            name: "{{ ['python3','chrony'] + ceph_pkgs }}"
             state: "{{ (upgrade_ceph_packages | bool) | ternary('latest', 'present') }}"
             update_cache: true
           register: result
           until: result is succeeded
 
+        - name: ensure chronyd is running
+          service:
+            name: chronyd
+            state: started
+            enabled: true
+
         - name: install container engine
           block:
             - name: install podman

diff --git a/tox.ini b/tox.ini
@@ -57,7 +57,13 @@ commands=
   bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}
   bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
 
+<<<<<<< HEAD
   ansible -v -i {changedir}/hosts all -b -m command -a 'dnf update -y'
+=======
+  # Get a system up-to-date before deploying
+  {el,rock}{8,9}: ansible -vv -i {changedir}/hosts all -b -m dnf -a 'name="*" state=latest'
+  ubuntu_lts: ansible -vv -i {changedir}/hosts all -b -m apt -a 'name="*" state=latest update_cache=true'
+>>>>>>> 807bc9c (preflight: chrony missing in Ubuntu prerequisites)
 
   # Install prerequisites
   ansible-playbook -vv -i {changedir}/hosts {toxinidir}/cephadm-preflight.yml --extra-vars "\