Merge lp:~objectif-libre/charms/trusty/keystone/cloudkitty-support into lp:~openstack-charmers-archive/charms/trusty/keystone/next

[Gauvain Pocentek]

If needed the initial charm for CloudKitty is available here: https://code.launchpad.net/~objectif-libre/charms/trusty/cloudkitty/trunk

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #9097 keystone-next for gpocentek mp269650
    LINT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #8406 keystone-next for gpocentek mp269650
    UNIT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6155 keystone-next for gpocentek mp269650
    AMULET OK: passed

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

=== modified file 'hooks/keystone_utils.py'
--- hooks/keystone_utils.py	2015-06-10 13:59:24 +0000
+++ hooks/keystone_utils.py	2015-08-31 15:27:55 +0000
@@ -269,6 +269,10 @@
     "midonet": {
         "type": "network-overlay",
         "desc": "MidoNet low-level API"
+    },
+    "cloudkitty": {
+        "type": "rating",
+        "desc": "CloudKitty Rating API"
     }
 }