Merge lp:~chmouel/nova/lp684657 into lp:~hudson-openstack/nova/trunk

[Chmouel Boudjnah]

Trivial fixes and improvement to novarc

[lp:~chmouel/nova/lp684657]

442. By Chmouel Boudjnah on 2010-12-03

make the change more robust.

- make sure it's compatible between zsh and bash.

[Soren Hansen (soren)]

2010/12/3 Chmouel Boudjnah <email address hidden>:
> === modified file 'nova/auth/novarc.template'
> --- nova/auth/novarc.template   2010-07-15 15:52:11 +0000
> +++ nova/auth/novarc.template   2010-12-03 14:23:53 +0000
> @@ -1,3 +1,5 @@
> +[ -n $BASH_SOURCE ] || BASH_SOURCE=$(readlink -f $0)
> +

This won't work. novarc is sourced, not run as a script, so $0
is "bash" or something like that. What you need is an equivalent
of __file__.

> -alias ec2-bundle-image="ec2-bundle-image --cert ${EC2_CERT} --privatekey ${EC2_PRIVATE_KEY} --user 42 --ec2cert ${NOVA_CERT}"
> -alias ec2-upload-bundle="ec2-upload-bundle -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}"
> +
> +[ -x /usr/bin/ec2-bundle-image ] && E_B_IMG=/usr/bin/ec2-bundle-image || E_B_IMG=/usr/bin/euca-bundle-image
> +[ -x /usr/bin/ec2-upload-image ] && E_U_IMG=/usr/bin/ec2-upload-bundle || E_U_IMG=/usr/bin/euca-upload-bundle
> +
> +alias ${E_B_IMG}="${E_B_IMG} --cert ${EC2_CERT} --privatekey ${EC2_PRIVATE_KEY} --user 42 --ec2cert ${NOVA_CERT}"
> +alias ${E_U_IMG}="${E_U_IMG} -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}"

I'm not sure this is necessary. I've succesfully run euca-*bundle*
without any problems without this fix?

--
Soren Hansen
Ubuntu Developer    http://www.ubuntu.com/
OpenStack Developer http://www.openstack.org/

[Thierry Carrez (ttx)]

I confirm this is not needed. Only the ec2-* tools need to be aliased to contain extra parameters. euca-* tools don't need those.

review: Disapprove

[Eric Day (eday)]

Should we mark this as rejected, or does it need fixing?

review: Needs Information

[Thierry Carrez (ttx)]

My take is that we should reject it, but Chmouel might stand up and defend his change :)

[Chmouel Boudjnah (chmouel)]

On 22/12/2010 16:45, Thierry Carrez wrote:
> My take is that we should reject it, but Chmouel might stand up and defend his change :)
Well things are still not working when using a different shell than bash
which is a bit annoying but I would not call it a critical bug (we
supposed to use OpenStack API these days anyway).

Chmouel.

[Thierry Carrez (ttx)]

Right, this covers in fact two bugs, one of which is invalid, and the other is Low prio. We should reject this branch and wait for a version that only fixes the bashisms.

Chmouel: in all cases, could you file a separate bug for the "doesn't run in bash" issue so that we don't lose track of that ?

[Chmouel Boudjnah (chmouel)]

> Chmouel: in all cases, could you file a separate bug for the "doesn't run in
> bash" issue so that we don't lose track of that ?

Sure I will do that!

[Devin Carlen (devcamcar)]

Looks like this has been thoroughly discussed and the consensus is to reject this patch. I'll mark it as such.

Unmerged revisions

442. By Chmouel Boudjnah on 2010-12-03

make the change more robust.

- make sure it's compatible between zsh and bash.

441. By Chmouel Boudjnah on 2010-12-03

Fix for novarc.

- Use euca-* prefix instead of ec2 when ec2 tools are not present.
- Make it zsh compatible (probably compatible against other bourne shells but
  not tested).

=== modified file 'nova/auth/novarc.template'
--- nova/auth/novarc.template	2010-07-15 15:52:11 +0000
+++ nova/auth/novarc.template	2010-12-03 14:29:41 +0000
@@ -1,3 +1,5 @@
+[[ -n $BASH_SOURCE ]] || BASH_SOURCE=$(readlink -f $0)
+
 NOVA_KEY_DIR=$(pushd $(dirname $BASH_SOURCE)>/dev/null; pwd; popd>/dev/null)
 export EC2_ACCESS_KEY="%(access)s:%(project)s"
 export EC2_SECRET_KEY="%(secret)s"
@@ -8,5 +10,9 @@
 export EC2_CERT=${NOVA_KEY_DIR}/%(cert)s
 export NOVA_CERT=${NOVA_KEY_DIR}/%(nova)s
 export EUCALYPTUS_CERT=${NOVA_CERT} # euca-bundle-image seems to require this set
-alias ec2-bundle-image="ec2-bundle-image --cert ${EC2_CERT} --privatekey ${EC2_PRIVATE_KEY} --user 42 --ec2cert ${NOVA_CERT}"
-alias ec2-upload-bundle="ec2-upload-bundle -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}"
+
+[[ -x /usr/bin/ec2-bundle-image ]] && E_B_IMG=/usr/bin/ec2-bundle-image || E_B_IMG=/usr/bin/euca-bundle-image
+[[ -x /usr/bin/ec2-upload-image ]] && E_U_IMG=/usr/bin/ec2-upload-bundle || E_U_IMG=/usr/bin/euca-upload-bundle
+
+alias ${E_B_IMG##*/}="${E_B_IMG} --cert ${EC2_CERT} --privatekey ${EC2_PRIVATE_KEY} --user 42 --ec2cert ${NOVA_CERT}"
+alias ${E_U_IMG##*/}="${E_U_IMG} -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}"