Merge lp:~gnuoy/charms/trusty/keystone/add-dnsaas-svc into lp:~openstack-charmers-archive/charms/trusty/keystone/next

Proposed by Liam Young
Status: Merged
Merged at revision: 204
Proposed branch: lp:~gnuoy/charms/trusty/keystone/add-dnsaas-svc
Merge into: lp:~openstack-charmers-archive/charms/trusty/keystone/next
Diff against target: 13 lines (+4/-0)
1 file modified
hooks/keystone_utils.py (+4/-0)
To merge this branch: bzr merge lp:~gnuoy/charms/trusty/keystone/add-dnsaas-svc
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Review via email: mp+283922@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Page (james-page) :
review: Needs Fixing
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #16947 keystone-next for gnuoy mp283922
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/16947/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #18191 keystone-next for gnuoy mp283922
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/18191/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #9063 keystone-next for gnuoy mp283922
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/9063/

Revision history for this message
James Page (james-page) wrote :

Fixed description and landed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/keystone_utils.py'
2--- hooks/keystone_utils.py 2016-01-19 16:54:03 +0000
3+++ hooks/keystone_utils.py 2016-01-26 10:50:00 +0000
4@@ -286,6 +286,10 @@
5 "ironic": {
6 "type": "baremetal",
7 "desc": "Ironic bare metal provisioning service"
8+ },
9+ "designate": {
10+ "type": "dns",
11+ "desc": "DNSaaS"
12 }
13 }
14

Subscribers

People subscribed via source and target branches