Merge lp:~ev/adt-cloud-worker/uci-nova into lp:~canonical-ci-engineering/adt-cloud-worker/uci-nova

[Evan]

Suppressing noisy output.

When neutron isn't installed, we produce error messages that look as though they are fatal:

Creating new SSH key on /tmp/adt-nova-8TjfiS
Creating specific nova keypair: adt-nova-8TjfiS
/usr/share/autopkgtest/ssh-setup/uci-nova: 188: /usr/share/autopkgtest/ssh-setup/uci-nova: neutron: not found
Creating specific nova security-group: adt-nova-8TjfiS
Allowing ingress SSH ...

[lp:~ev/adt-cloud-worker/uci-nova]

11. By Evan on 2015-04-17

Not actually a comment.

[Celso Providelo (cprov)]

Thanks for preserving the "#cloud-config" watermark, I am not sure if it would work with the extra space.

Other than that, thanks for suppressing the confusing "neutron not found" message and make the output saner.

review: Approve

[lp:~ev/adt-cloud-worker/uci-nova]

12. By Evan on 2015-04-17

Be less noisy.

13. By Evan on 2015-04-17

Less noisy still.

[Celso Providelo (cprov)]

review: Approve

=== modified file 'uci-nova'
--- uci-nova	2015-04-15 18:53:01 +0000
+++ uci-nova	2015-04-17 16:03:49 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -eu
 #
 # This script is part of autopkgtest
 # autopkgtest is a tool for testing Debian binary packages
@@ -122,13 +122,15 @@
 }
 
 security_setup_nova() {
-    debug "Creating specific nova security-group: $SRVNAME"
-    nova secgroup-create $SRVNAME "$SRVNAME testbed"
-
-    debug "Allowing ingress SSH ..."
-    nova secgroup-add-rule $SRVNAME tcp 22 22 0.0.0.0/0
-
-    debug "Egress traffic will respect external Firewall rules ..."
+    if ! nova secgroup-create $SRVNAME "$SRVNAME testbed" >/dev/null 2&>1; then
+        debug "Could not create specific nova security-group: $SRVNAME"
+        exit 1
+    fi
+
+    if ! nova secgroup-add-rule $SRVNAME tcp 22 22 0.0.0.0/0 >/dev/null 2&>1; then
+        debug "Could not allow ingress SSH."
+        exit 1
+    fi
 }
 
 security_setup_neutron() {
@@ -141,7 +143,7 @@
 	--format csv -c id -c security_group --quote none \
 	| grep $SRVNAME | cut -d',' -f1)
     for rule_id in $DEFAULT_RULES; do
-	neutron security-group-rule-delete $rule_id
+	    neutron security-group-rule-delete $rule_id
     done
 
     debug "Allowing ingress SSH ..."
@@ -185,10 +187,11 @@
 
     # Setup testbed security with nova or neutron according to their
     # availability in the target cloud.
-    if ! neutron security-group-list; then
-	security_setup_nova
+    if type neutron >/dev/null && neutron security-group-list; then
+        debug "Setting up neutron secgroup"
+        security_setup_neutron
     else
-        security_setup_neutron
+	    security_setup_nova
     fi
         
     # generate cloud-init user data; mostly for manage_etc_hosts, but also get
@@ -315,18 +318,21 @@
         nova console-log $SRVNAME > $CONSOLE
     fi
 
-    debug "Deleting $SRVNAME instance"
-    nova delete $SRVNAME || true
-
-    debug "Deleting $SRVNAME keypair"
-    nova keypair-delete $SRVNAME || true
-
-    debug "Deleting /tmp/$SRVNAME SSH keys"
-    rm -rf /tmp/$SRVNAME || true
+    if ! nova delete $SRVNAME >/dev/null >2&1; then
+        error "Could not delete $SRVNAME instance."
+    fi
+
+    if ! nova keypair-delete $SRVNAME >2&1; then
+        error "Could not delete $SRVNAME keypair."
+    fi
+
+    if ! rm -rf /tmp/$SRVNAME; then
+        debug "Could not delete /tmp/$SRVNAME SSH keys"
+    fi
 
     DELETE_CMD="neutron security-group-delete $SRVNAME"
     if ! neutron security-group-list; then
-	DELETE_CMD="nova secgroup-delete $SRVNAME"
+	    DELETE_CMD="nova secgroup-delete $SRVNAME"
     fi
 
     debug "Deleting $SRVNAME security-group"