Merge lp:~gnuoy/charms/trusty/keystone/secret-store into lp:~openstack-charmers-archive/charms/trusty/keystone/next

Proposed by Liam Young
Status: Work in progress
Proposed branch: lp:~gnuoy/charms/trusty/keystone/secret-store
Merge into: lp:~openstack-charmers-archive/charms/trusty/keystone/next
Diff against target: 16 lines (+5/-1)
1 file modified
hooks/keystone_utils.py (+5/-1)
To merge this branch: bzr merge lp:~gnuoy/charms/trusty/keystone/secret-store
Reviewer Review Type Date Requested Status
James Page Needs Information
Review via email: mp+280275@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Page (james-page) :
review: Needs Information
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #15276 keystone-next for gnuoy mp280275
    LINT OK: passed

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

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

charm_unit_test #14249 keystone-next for gnuoy mp280275
    UNIT OK: passed

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

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

Looking at:

  https://github.com/openstack/barbican/blob/master/bin/keystone_data.sh

I think its 'barbican' and 'key-manager'

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

charm_amulet_test #8245 keystone-next for gnuoy mp280275
    AMULET OK: passed

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

Unmerged revisions

194. By Liam Young

Allow barbican to register endpoints

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 2015-10-30 23:30:09 +0000
3+++ hooks/keystone_utils.py 2015-12-11 10:43:19 +0000
4@@ -275,7 +275,11 @@
5 "ironic": {
6 "type": "baremetal",
7 "desc": "Ironic bare metal provisioning service"
8- }
9+ },
10+ "secretstore": {
11+ "type": "secrets",
12+ "desc": "Secret management"
13+ },
14 }
15
16 # The interface is said to be satisfied if anyone of the interfaces in the

Subscribers

People subscribed via source and target branches