Enable filesystem and http stores by default and make context a little more standard

hooks/glance_contexts.py

@@ -53,16 +53,16 @@ class ObjectStoreContext(OSContextGenerator):
 class MultiStoreContext(OSContextGenerator):
 
     def __call__(self):
+        stores = ['glance.store.filesystem.Store', 'glance.store.http.Store']
         store_mapping = {
             'ceph': 'glance.store.rbd.Store',
             'object-store': 'glance.store.swift.Store',
         }
-        stores = []
         for store_relation, store_type in store_mapping.iteritems():
             if relation_ids(store_relation):
                 stores.append(store_type)
         return {
-            'known_stores': 'known_stores = ' + ','.join(stores)
+            'known_stores': ','.join(stores)
         }
 
 

templates/juno/glance-api.conf

@@ -3,7 +3,7 @@ verbose = {{ verbose }}
 use_syslog = {{ use_syslog }}
 debug = {{ debug }}
 
-{{ known_stores }}
+known_stores = {{ known_stores }}
 {% if rbd_pool -%}
 default_store = rbd
 {% elif swift_store -%}