Juju Charms Collection
keystone package

Merge lp:~yolanda.robla/charms/precise/keystone/add_heat_cfn into lp:~charmers/charms/precise/keystone/trunk

  1. Precise Pangolin (12.04)
  2. add_heat_cfn
  3. Merge into trunk
Proposed by Yolanda Robla
Status: Merged
Merged at revision: 53
Proposed branch: lp:~yolanda.robla/charms/precise/keystone/add_heat_cfn
Merge into: lp:~charmers/charms/precise/keystone/trunk
Diff against target: 24 lines (+6/-2)
2 files modified
hooks/keystone_hooks.py (+5/-1)
revision (+1/-1)
To merge this branch: bzr merge lp:~yolanda.robla/charms/precise/keystone/add_heat_cfn
Reviewer Review Type Date Requested Status
James Page Approve
Marco Ceppi (community) Abstain
Review via email: mp+196867@code.launchpad.net

Description of the change

Added Heat CFN service

To post a comment you must log in.
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

Deferring to ~openstack-charmers

review: Abstain
Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'hooks/keystone_hooks.py'
--- hooks/keystone_hooks.py 2013-11-25 19:58:33 +0000
+++ hooks/keystone_hooks.py 2013-11-27 11:25:34 +0000
@@ -98,8 +98,12 @@
98 },98 },
99 "heat": {99 "heat": {
100 "type": "orchestration",100 "type": "orchestration",
101 "desc": "Heat Orchestration Service"101 "desc": "Heat Orchestration API"
102 },102 },
103 "heat-cfn": {
104 "type": "cloudformation",
105 "desc": "Heat CloudFormation API"
106 }
103}107}
104108
105109
106110
=== modified file 'revision'
--- revision 2013-11-25 19:58:33 +0000
+++ revision 2013-11-27 11:25:34 +0000
@@ -1,1 +1,1 @@
12271228

Subscribers

People subscribed via source and target branches

to all changes: