summaryrefslogtreecommitdiff
path: root/tests/cloud_tests/configs/modules/ntp_servers.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'tests/cloud_tests/configs/modules/ntp_servers.yaml')
-rw-r--r--tests/cloud_tests/configs/modules/ntp_servers.yaml8
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/cloud_tests/configs/modules/ntp_servers.yaml b/tests/cloud_tests/configs/modules/ntp_servers.yaml
index 9d1d65ef..d59d45a8 100644
--- a/tests/cloud_tests/configs/modules/ntp_servers.yaml
+++ b/tests/cloud_tests/configs/modules/ntp_servers.yaml
@@ -1,12 +1,7 @@
#
# NTP config using specific servers
#
-# NOTE: this should not require apt feature, use 'which' rather than 'dpkg -l'
-# NOTE: this should not require no_ntpdate feature, use 'which' to check for
-# installation rather than 'dpkg -l', as 'grep ntp' matches 'ntpdate'
required_features:
- - apt
- - no_ntpdate
- lsb_release
cloud_config: |
#cloud-config
@@ -17,7 +12,8 @@ cloud_config: |
collect_scripts:
ntp_installed_servers: |
#!/bin/sh
- dpkg -l | grep -c ntp
+ ntpd --version > /dev/null 2>&1
+ echo $?
ntp_conf_dist_servers: |
#!/bin/sh
cat /etc/ntp.conf.dist | wc -l