Merge lp://staging/~thumper/juju-core/more-ipperms into lp://staging/~juju/juju-core/trunk
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~thumper/juju-core/more-ipperms |
| Merge into: | lp://staging/~juju/juju-core/trunk |
| Diff against target: |
32 lines (+4/-1) 1 file modified
environs/ec2/ec2.go (+4/-1) |
| To merge this branch: | bzr merge lp://staging/~thumper/juju-core/more-ipperms |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Juju Engineering | Pending | ||
|
Review via email:
|
|||
Description of the change
Keep the groupId from ec2 permission groups.
If ec2 tells us only group Id values, and not Names, then we need to be
able to reproduce this when wanting to revoke permissions.
| Tim Penhey (thumper) wrote | # |
| Roger Peppe (rogpeppe) wrote | # |
Unmerged revisions
- 1189. By Tim Penhey
-
Remember the id as well for the groups.
- 1188. By Dimiter Naydenov
-
environs/cloudinit: fix raring issue
This works around LP bug #1103881, so cloudinit will
succeed on raring, rather than failing to execute
any scripts. The problem seems to be upgrading upstart
causes unexpected failures.This has been tested live on ec2/eu-west-1 as well.
R=fwereade, rog
CC=
https://codereview. appspot. com/8648047 - 1187. By Roger Peppe
-
state/statecmd: fix ServiceGet
Fixes bugs #1130149 and #1170425.
R=dimitern, TheMue, fwereade, danilo.segan
CC=
https://codereview. appspot. com/8851045 - 1186. By William Reade
-
cmd/juju: alphabetise status output fields
R=dimitern
CC=
https://codereview. appspot. com/8834047 - 1185. By Raphaël Badin
-
Add constraints support to the MAAS provider.
It does not add support for MAAS-specific constraints ('maas-name' and
'maas-tag') because juju-core currently does not support provider-specific
constraints yet.
Also, the constraint 'CpuPower' has no obvious meaning in MAAS so it is simply
ignored (with a warning).I had to change the testservice in gomaasapi so that the 'acquire' operation
is now recorded (hence the change to existing tests).
[https://code.launchpad .net/~rvb/ gomaasapi/ record- node-acquire/ +merge/ 159404]. This change was successfully tested in the MAAS lab.
- 1184. By William Reade
-
version: revert to get more fixes in for 1.10.0
R=dfc, rog
CC=
https://codereview. appspot. com/8855044 - 1183. By Dimiter Naydenov
-
version: bump to 1.10.0
This is the release version, as agreed.
- 1182. By Roger Peppe
-
cmd/juju: implement life in status
R=dimitern, fwereade
CC=
https://codereview. appspot. com/8852043 - 1181. By Roger Peppe
-
cmd/juju: log when the command finishes
Also make sure that machine and unit agents
always print the finished error message.R=fwereade, dimitern
CC=
https://codereview. appspot. com/8658045 - 1180. By Roger Peppe
-
cmd/juju: show machine series in status
This is dimitern's branch. Submitting because he has lbox issues.
Reviewers: mp+159994_
Message:
Please take a look.
Description:
Keep the groupId from ec2 permission groups.
If ec2 tells us only group Id values, and not Names, then we need to be
able to reproduce this when wanting to revoke permissions.
https:/
(do not edit description out of merge proposal)
Please review this at https:/
Affected files:
A [revision details]
M environs/ec2/ec2.go
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:
<email address hidden>
+New revision: <email address hidden>
Index: environs/ec2/ec2.go
=== modified file 'environs/
--- environs/ec2/ec2.go 2013-04-16 07:37:30 +0000
+++ environs/ec2/ec2.go 2013-04-22 00:22:03 +0000
@@ -918,6 +918,7 @@
fromPort int
toPort int
groupName string
+ groupId string
ipAddr string
}
@@ -936,9 +937,11 @@
}
for _, g := range p.SourceGroups {
k.groupName = g.Name
+ k.groupId = g.Id
m[k] = true
}
k.groupName = ""
+ k.groupId = ""
for _, ip := range p.SourceIPs {
k.ipAddr = ip
m[k] = true
@@ -961,7 +964,7 @@
if p.ipAddr != "" {
ipp.SourceIPs = []string{p.ipAddr}
} else {
- ipp.SourceGroups = []ec2.UserSecur
+ ipp.SourceGroups = []ec2.UserSecur
p.groupId}}
}
ps = append(ps, ipp)
}