Merge lp:~celebdor/charms/trusty/keystone/midonet_valid_service into lp:~openstack-charmers-archive/charms/trusty/keystone/trunk

[Antoni Segura Puimedon]

Unmerged revisions

152. By Antoni Segura Puimedon <email address hidden> on 2015-05-08

MidoNet valid_service addition

MidoNet needs its low-level API to have access to the admin token.
Thus, it needs to be considered a valid service. This patch adds it
to the list of valid services so that the identity-service relation
can be completed successfully and with the admin_token.

=== modified file 'hooks/keystone_utils.py'
--- hooks/keystone_utils.py	2015-04-17 12:10:54 +0000
+++ hooks/keystone_utils.py	2015-05-08 13:35:24 +0000
@@ -255,6 +255,10 @@
     "image-stream": {
         "type": "product-streams",
         "desc": "Ubuntu Product Streams"
+    },
+    "midonet": {
+        "type": "network-overlay",
+        "desc": "MidoNet low-level API"
     }
 }