Merge lp:~ltrager/maas/lp1686171 into lp:~maas-committers/maas/trunk

[Lee Trager]

Warn users when running unsupported tests on 14.04

[Blake Rouse (blake-rouse)]

Seems like your missing the exit code.

review: Needs Information

[Andres Rodriguez (andreserl)]

Comment inline!

review: Needs Fixing

[Lee Trager (ltrager)]

I don't exit 1 after detecting 14.04 in case cloud-init or stress-ng are ever updated in 14.04 to include the features we need. I can add in the exit 1 if that is preferable.

The purpose of the NTP test is to ensure the MAAS configured NTP server is accessible by the machine. While I could install NTP I realized this would only test the default NTP server. This would be misleading to the user as they expect the MAAS NTP server to be tested, not the default. Further it may indicate to the user NTP configuration is supported in 14.04 when it really isn't.

[Blake Rouse (blake-rouse)]

I think exit 1 would be better.

For ntp what I would check for trusty and if ntpd is already installed then run the test (might be the case if cloud-init is every SRU'd). If trusty and ntpd is not installed print a nice message saying ntpd was not configured to use MAAS, will test with upstream ntpd.

Another thing that would be nice is to include the IP address or hostname that ntpd is testing. That might already be in the logs. If that is the case then just a nice warning say its running on trusty would be enough.

[Lee Trager (ltrager)]

Updated as per Blake's suggestions.

[Blake Rouse (blake-rouse)]

looks good

review: Approve

=== modified file 'src/metadataserver/builtin_scripts/ntp.sh'
--- src/metadataserver/builtin_scripts/ntp.sh	2017-03-29 21:32:26 +0000
+++ src/metadataserver/builtin_scripts/ntp.sh	2017-05-02 23:25:52 +0000
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash
 #
 # ntp - Run ntp clock set to verify NTP connectivity.
 #
@@ -22,9 +22,26 @@
 # cloud-init configures ntp to use the rack controller or a user configured
 # external ntp server before running the test scripts. This test ensures that
 # the configured NTP server is accessible.
-e=0
-ntpq -np
-sudo -n systemctl stop ntp.service
-sudo -n timeout 10 ntpd -gq || e=$?
-sudo -n systemctl start ntp.service
-exit $e
+
+source /etc/os-release
+
+if [ $VERSION_ID == "14.04" ]; then
+    which ntpq >/dev/null
+    if [ $? -ne 0 ]; then
+	echo -en 'Warning: NTP configuration is not supported in Trusty. ' 1>&2
+	echo -en 'Running with the default NTP configuration.\n\n' 1>&2
+	sudo -n apt-get install -q -y ntp
+    fi
+    ntpq -np
+    sudo -n service ntp stop
+    sudo -n timeout 10 ntpd -gq
+    ret=$?
+    sudo -n service ntp start
+else
+    ntpq -np
+    sudo -n systemctl stop ntp.service
+    sudo -n timeout 10 ntpd -gq
+    ret=$?
+    sudo -n systemctl start ntp.service
+fi
+exit $ret

=== modified file 'src/metadataserver/builtin_scripts/stress-ng-cpu-long.sh'
--- src/metadataserver/builtin_scripts/stress-ng-cpu-long.sh	2017-03-29 23:24:05 +0000
+++ src/metadataserver/builtin_scripts/stress-ng-cpu-long.sh	2017-05-02 23:25:52 +0000
@@ -19,6 +19,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+source /etc/os-release
+if [ $VERSION_ID == '14.04' ]; then
+    # The version of stress-ng in 14.04 does not support required features
+    # for testing. Warn and attempt to run incase stress-ng is ever upgraded.
+    echo 'stress-ng-cpu-long unsupported on 14.04, ' \
+	 'please use 16.04 or above.' 1>&2
+    exit 1
+fi
+
 sudo -n apt-get install -q -y stress-ng
 echo
 

=== modified file 'src/metadataserver/builtin_scripts/stress-ng-cpu-short.sh'
--- src/metadataserver/builtin_scripts/stress-ng-cpu-short.sh	2017-03-29 23:24:05 +0000
+++ src/metadataserver/builtin_scripts/stress-ng-cpu-short.sh	2017-05-02 23:25:52 +0000
@@ -19,6 +19,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+source /etc/os-release
+if [ $VERSION_ID == '14.04' ]; then
+    # The version of stress-ng in 14.04 does not support required features
+    # for testing. Warn and attempt to run incase stress-ng is ever upgraded.
+    echo 'stress-ng-cpu-short unsupported on 14.04, ' \
+	 'please use 16.04 or above.' 1>&2
+    exit 1
+fi
+
 sudo -n apt-get install -q -y stress-ng
 echo
 

=== modified file 'src/metadataserver/builtin_scripts/stress-ng-memory-long.sh'
--- src/metadataserver/builtin_scripts/stress-ng-memory-long.sh	2017-03-29 23:24:05 +0000
+++ src/metadataserver/builtin_scripts/stress-ng-memory-long.sh	2017-05-02 23:25:52 +0000
@@ -19,6 +19,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+source /etc/os-release
+if [ $VERSION_ID == '14.04' ]; then
+    # The version of stress-ng in 14.04 does not support required features
+    # for testing. Warn and attempt to run incase stress-ng is ever upgraded.
+    echo 'stress-ng-memory-long unsupported on 14.04, ' \
+	 'please use 16.04 or above.' 1>&2
+    exit 1
+fi
+
 sudo -n apt-get install -q -y stress-ng
 echo
 

=== modified file 'src/metadataserver/builtin_scripts/stress-ng-memory-short.sh'
--- src/metadataserver/builtin_scripts/stress-ng-memory-short.sh	2017-03-29 23:24:05 +0000
+++ src/metadataserver/builtin_scripts/stress-ng-memory-short.sh	2017-05-02 23:25:52 +0000
@@ -19,6 +19,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+source /etc/os-release
+if [ $VERSION_ID == '14.04' ]; then
+    # The version of stress-ng in 14.04 does not support required features
+    # for testing. Warn and attempt to run incase stress-ng is ever upgraded.
+    echo 'stress-ng-memory-short unsupported on 14.04, ' \
+	 'please use 16.04 or above.' 1>&2
+    exit 1
+fi
+
 sudo -n apt-get install -q -y stress-ng
 echo