Merge lp:~mikemc/charms/trusty/keystone/add-glance-simplestream-service into lp:~openstack-charmers-archive/charms/trusty/keystone/trunk

[Mike McCracken]

- Add service type for uploading images from simplestreams into glance/swift.

Add service type for uploading images from simplestreams into glance/swift.

The exact naming of this service type is open for suggestions, as is the potential need to add a second type now for a future service that will upload juju tools into openstack storage. One option is to use the same service type name for both, since they'll both be configured by the same charm.

[James Page (james-page)]

review: Needs Fixing

[lp:~mikemc/charms/trusty/keystone/add-glance-simplestream-service]

67. By Mike McCracken on 2014-06-05

rename according to feedback

Unmerged revisions

=== modified file 'hooks/keystone_utils.py'
--- hooks/keystone_utils.py	2014-05-21 10:02:01 +0000
+++ hooks/keystone_utils.py	2014-06-05 14:49:05 +0000
@@ -168,6 +168,10 @@
     "heat-cfn": {
         "type": "cloudformation",
         "desc": "Heat CloudFormation API"
+    },
+    "image-stream": {
+        "type": "product-streams",
+        "desc": "Ubuntu Product Streams"
     }
 }