Install ntp package in correct setup (refs #20488).

1.Base/1.Utilities/0_setup.py

@@ -9,7 +9,7 @@ def setup(interactive=True):
     cmds = [
         'apt-get clean',
         'apt-get update',
-        'apt-get install --yes make ipython ipython3 vim netcat git htop iotop bmon host lm-sensors pciutils ntp nfs-client smartmontools pwgen dialog curl python3-requests',
+        'apt-get install --yes make ipython ipython3 vim netcat git htop iotop bmon host lm-sensors pciutils nfs-client smartmontools pwgen dialog curl python3-requests',
         # Locale
         'locale-gen en_GB.UTF-8',
         'update-locale LANG=en_GB.UTF-8 LANGUAGE=en_GB.UTF-8 LC_ALL=en_GB.UTF-8 LC_MESSAGES=en_GB.UTF-8',

2.Common_services/1.Postfix/0_setup.py

@@ -14,7 +14,7 @@ def setup(interactive=True):
     # Install and configure postfix
     dir_path = utils.get_dir(__file__)
     cmds = [
-        'DEBIAN_FRONTEND=noninteractive apt-get -y install postfix mailutils',
+        'DEBIAN_FRONTEND=noninteractive apt-get install -y postfix mailutils',
         'echo "Replacing /etc/postfix/main.cf"',
         dict(line='write', template='%s/main.cf' % dir_path, target='/etc/postfix/main.cf', params=(
             ('{{ hostname }}', hostname),

2.Common_services/2.NTP/0_setup.py

@@ -7,6 +7,7 @@ def setup(interactive=True):
     dir_path = utils.get_dir(__file__)
     cmds = [
         # NTP
+        'DEBIAN_FRONTEND=noninteractive apt-get install -y ntp',
         'echo "Replacing /etc/ntp.conf"',
         dict(line='write', template='%s/ntp.conf' % dir_path, target='/etc/ntp.conf', params=(
             ('{{ NTP_SERVER }}', utils.get_conf('NTP_SERVER') or utils.get_conf('NTP_SERVER1') or 'ntp.ubuntu.com'),

tests/test_apt.sh

@@ -11,8 +11,8 @@ apt-get clean
 
 if ( dpkg -s sl >/dev/null 2>&1 ); then
    echo "Removing already installed testing package"
-   apt-get -y remove sl
+   apt-get remove -y sl
 fi 
 
 # Installation testing package sl
-apt-get update && apt-get -y install sl && apt-get -y remove sl
+apt-get update && apt-get install -y sl && apt-get remove -y sl