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

[Celso Providelo]

Fixing broken stderr/stdout redirect notation.

Fixing broken stderr/stdout redirect notation.

[Paul Larson (pwlars)]

I'd like to hear more about what was wrong with this, perhaps a comment is in order to keep someone from trying the same thing again? +1 otherwise though

review: Approve

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

10. By Celso Providelo on 2015-04-20

Re-fixing uci-nova redirect notation (2>&1 instead 2&>1).

[Joe Talbott (joetalbott)]

looks okay to me. One in-line question.

[Paul Larson (pwlars)]

One question

review: Needs Information

[Evan (ev)]

See inline.

review: Needs Fixing

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

11. By Celso Providelo on 2015-04-20

Addressing review comments.

[Celso Providelo (cprov)]

Ev, Paul,

Thanks for catching that problem, uci-nova is fixed.

[Francis Ginther (fginther)]

Tested with atd-run.

review: Approve

[Paul Larson (pwlars)]

review: Approve

[Paul Larson (pwlars)]

I'm actually still not 100% sure of the logic there, and it looks like you did something different from what Evan recommended but Francis said he was able to test it and see it work too. So, I'd like to see it land if it works, but maybe just add a quick comment about what it's doing there since there seems to be some confusion about it.

review: Approve

[Celso Providelo (cprov)]

Paul, diff line 55 is exactly what Ev suggested, I am missing something ?

[Paul Larson (pwlars)]

Nope, you're correct. I think I ended up looking at an old revision because I was viewing the comments.

review: Approve

=== modified file 'uci-nova'
--- uci-nova	2015-04-17 16:03:38 +0000
+++ uci-nova	2015-04-20 21:34:40 +0000
@@ -122,12 +122,12 @@
 }
 
 security_setup_nova() {
-    if ! nova secgroup-create $SRVNAME "$SRVNAME testbed" >/dev/null 2&>1; then
+    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
+    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
@@ -187,11 +187,11 @@
 
     # Setup testbed security with nova or neutron according to their
     # availability in the target cloud.
-    if type neutron >/dev/null && neutron security-group-list; then
+    if type neutron >/dev/null && neutron security-group-list >/dev/null; then
         debug "Setting up neutron secgroup"
         security_setup_neutron
     else
-	    security_setup_nova
+        security_setup_nova
     fi
         
     # generate cloud-init user data; mostly for manage_etc_hosts, but also get
@@ -318,21 +318,21 @@
         nova console-log $SRVNAME > $CONSOLE
     fi
 
-    if ! nova delete $SRVNAME >/dev/null >2&1; then
+    if ! nova delete $SRVNAME >/dev/null 2>&1; then
         error "Could not delete $SRVNAME instance."
     fi
 
-    if ! nova keypair-delete $SRVNAME >2&1; then
+    if ! nova keypair-delete $SRVNAME >/dev/null 2>&1; then
         error "Could not delete $SRVNAME keypair."
     fi
 
-    if ! rm -rf /tmp/$SRVNAME; then
+    if ! rm -rf /tmp/$SRVNAME >/dev/null 2>&1; 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"
+    if ! type neutron >/dev/null || ! neutron security-group-list >/dev/null; then
+        DELETE_CMD="nova secgroup-delete $SRVNAME"
     fi
 
     debug "Deleting $SRVNAME security-group"