Merge lp:~chmouel/nova/lp684657 into lp:~hudson-openstack/nova/trunk
Proposed by
Chmouel Boudjnah
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Devin Carlen | ||||
Proposed branch: | lp:~chmouel/nova/lp684657 | ||||
Merge into: | lp:~hudson-openstack/nova/trunk | ||||
Diff against target: |
21 lines (+8/-2) 1 file modified
nova/auth/novarc.template (+8/-2) |
||||
To merge this branch: | bzr merge lp:~chmouel/nova/lp684657 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Eric Day (community) | Needs Information | ||
Thierry Carrez (community) | Disapprove | ||
Review via email: mp+42624@code.launchpad.net |
Description of the change
Trivial fixes and improvement to novarc
To post a comment you must log in.
Unmerged revisions
- 442. By Chmouel Boudjnah
-
make the change more robust.
- make sure it's compatible between zsh and bash.
- 441. By Chmouel Boudjnah
-
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).
2010/12/3 Chmouel Boudjnah <email address hidden>: novarc. template' novarc. template 2010-07-15 15:52:11 +0000 novarc. template 2010-12-03 14:23:53 +0000 $(readlink -f $0)
> === modified file 'nova/auth/
> --- nova/auth/
> +++ nova/auth/
> @@ -1,3 +1,5 @@
> +[ -n $BASH_SOURCE ] || BASH_SOURCE=
> +
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}" bundle= "ec2-upload- bundle -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}" ec2-bundle- image ] && E_B_IMG= /usr/bin/ ec2-bundle- image || E_B_IMG= /usr/bin/ euca-bundle- image ec2-upload- image ] && E_U_IMG= /usr/bin/ ec2-upload- bundle || E_U_IMG= /usr/bin/ euca-upload- bundle ="${E_B_ IMG} --cert ${EC2_CERT} --privatekey ${EC2_PRIVATE_KEY} --user 42 --ec2cert ${NOVA_CERT}" ="${E_U_ IMG} -a ${EC2_ACCESS_KEY} -s ${EC2_SECRET_KEY} --url ${S3_URL} --ec2cert ${NOVA_CERT}"
> -alias ec2-upload-
> +
> +[ -x /usr/bin/
> +[ -x /usr/bin/
> +
> +alias ${E_B_IMG}
> +alias ${E_U_IMG}
I'm not sure this is necessary. I've succesfully run euca-*bundle*
without any problems without this fix?
-- www.ubuntu. com/ www.openstack. org/
Soren Hansen
Ubuntu Developer http://
OpenStack Developer http://