Merge lp:~teknico/charms/precise/keystone/add-valid-service into lp:~openstack-charmers-archive/charms/precise/keystone/trunk

[Marco Ceppi]

An entry for the simplestreams-mirror service is added to the valid_services structure in keystone_hooks.py .

The simplestreams-mirror charm that needs this can be found at https://code.launchpad.net/~teknico/charms/precise/simplestreams-mirror/trunk .

[Marco Ceppi (marcoceppi)]

Deferring to openstack-charmers

review: Abstain

[James Page (james-page)]

On the assumption that this is intended for tools like juju to consume, the name and type of the service needs to be 'product-streams' not 'simplestreams-mirror' - please double check this with the juju-core team to ensure that catalog lookups will work OK.

review: Needs Fixing

[James Page (james-page)]

We can also drop:

    "oxygen": {
        "type": "oxygen",
        "desc": "Oxygen Cloud Image Service"
    },

This was a pre-cursor to simplestreams.

Unmerged revisions

57. By Nicola Larosa on 2014-02-11

The type too.

56. By Nicola Larosa on 2014-02-11

Updates per James Page's review.

55. By Nicola Larosa on 2014-02-11

Merge from trunk.

54. By Nicola Larosa on 2014-02-06

Add to valid_services and entry for simplestreams-mirror.

=== modified file 'hooks/keystone_hooks.py'
--- hooks/keystone_hooks.py	2014-02-03 11:58:43 +0000
+++ hooks/keystone_hooks.py	2014-02-19 12:35:54 +0000
@@ -88,10 +88,6 @@
         "type": "network",
         "desc": "Quantum Networking Service"
     },
-    "oxygen": {
-        "type": "oxygen",
-        "desc": "Oxygen Cloud Image Service"
-    },
     "ceilometer": {
         "type": "metering",
         "desc": "Ceilometer Metering Service"
@@ -103,6 +99,10 @@
     "heat-cfn": {
         "type": "cloudformation",
         "desc": "Heat CloudFormation API"
+    },
+    "product-streams": {
+        "type": "product-streams",
+        "desc": "Product caching using Simplestreams"
     }
 }