Merge lp://staging/~jameinel/juju-core/hpcloud-1229480 into lp://staging/juju-core/1.14
Proposed by
John A Meinel
| Status: | Merged |
|---|---|
| Approved by: | John A Meinel |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 1751 |
| Proposed branch: | lp://staging/~jameinel/juju-core/hpcloud-1229480 |
| Merge into: | lp://staging/juju-core/1.14 |
| Diff against target: |
15 lines (+2/-2) 1 file modified
provider/openstack/provider.go (+2/-2) |
| To merge this branch: | bzr merge lp://staging/~jameinel/juju-core/hpcloud-1229480 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Juju Engineering | Pending | ||
|
Review via email:
|
|||
Commit message
fix boilerplate for hpcloud
We were saying AWS_ACCESS_KEY which we don't support and
AWS_SECRET_KEY which we do support, but probably isn't what we would
actually prefer to use for Openstack env variables
Description of the change
fix boilerplate for hpcloud
We were saying AWS_ACCESS_KEY which we don't support and
AWS_SECRET_KEY which we do support, but probably isn't what we would
actually prefer to use for Openstack env variables
To post a comment you must log in.
Revision history for this message
| John A Meinel (jameinel) wrote | # |
Revision history for this message
| William Reade (fwereade) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Reviewers: mp+187485_
Message:
Please take a look.
Description:
fix boilerplate for hpcloud
We were saying AWS_ACCESS_KEY which we don't support and
AWS_SECRET_KEY which we do support, but probably isn't what we would
actually prefer to use for Openstack env variables
https:/
(do not edit description out of merge proposal)
Please review this at https:/
Affected files (+4, -2 lines):
A [revision details]
M provider/
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-
+New revision: <email address hidden>
Index: provider/
=== modified file 'provider/
--- provider/
+++ provider/
@@ -114,9 +114,9 @@
# region: <your region>
# The following are used for keypair authentication
# auth-mode: keypair
- # Usually set via the env variable AWS_ACCESS_KEY_ID, but can be
specified here
+ # Usually set via the env variable OS_ACCESS_KEY, but can be specified
here
# access-key: <secret>
- # Usually set via the env variable AWS_SECRET_
specified here
+ # Usually set via the env variable OS_SECRET_KEY, but can be specified
here
# secret-key: <secret>
`[1:]