Merge lp:~gandelman-a/charm-helpers/image_service_ctxt into lp:charm-helpers

[Adam Gandelman]

Adds another OpenStack context generator for image-service relations, to be shared across nova and cinder charms. Also updated the templates to prevent unnecessary whitespace in rendered configs.

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2013-07-12 08:18:11 +0000
+++ charmhelpers/contrib/openstack/context.py	2013-07-19 23:38:34 +0000
@@ -206,6 +206,29 @@
         return {}
 
 
+class ImageServiceContext(OSContextGenerator):
+    interfaces = ['image-servce']
+
+    def __call__(self):
+        '''
+        Obtains the glance API server from the image-service relation.  Useful
+        in nova and cinder (currently).
+        '''
+        log('Generating template context for image-service.')
+        rids = relation_ids('image-service')
+        if not rids:
+            return {}
+        for rid in rids:
+            for unit in related_units(rid):
+                api_server = relation_get('glance-api-server',
+                                          rid=rid, unit=unit)
+                if api_server:
+                    return {'glance_api_servers': api_server}
+        log('ImageService context is incomplete. '
+            'Missing required relation data.')
+        return {}
+
+
 class ApacheSSLContext(OSContextGenerator):
     """
     Generates a context for an apache vhost configuration that configures

=== modified file 'charmhelpers/contrib/openstack/templates/ceph.conf'
--- charmhelpers/contrib/openstack/templates/ceph.conf	2013-07-04 01:37:18 +0000
+++ charmhelpers/contrib/openstack/templates/ceph.conf	2013-07-19 23:38:34 +0000
@@ -3,9 +3,9 @@
 # cinder configuration file maintained by Juju
 # local changes may be overwritten.
 ###############################################################################
-{% if auth %}
+{% if auth -%}
 [global]
  auth_supported = {{ auth }}
  keyring = /etc/ceph/$cluster.$name.keyring
  mon host = {{ mon_hosts }}
-{% endif %}
+{% endif -%}

=== modified file 'charmhelpers/contrib/openstack/templates/haproxy.cfg'
--- charmhelpers/contrib/openstack/templates/haproxy.cfg	2013-07-04 01:37:18 +0000
+++ charmhelpers/contrib/openstack/templates/haproxy.cfg	2013-07-19 23:38:34 +0000
@@ -25,7 +25,7 @@
     stats uri /
     stats auth admin:password
 
-{% if units %}
+{% if units -%}
 {% for service, ports in service_ports.iteritems() -%}
 listen {{ service }} 0.0.0.0:{{ ports[0] }}
     balance roundrobin
@@ -33,5 +33,5 @@
     {% for unit, address in units.iteritems() -%}
     server {{ unit }} {{ address }}:{{ ports[1] }} check
     {% endfor %}
-{% endfor %}
-{% endif %}
+{% endfor -%}
+{% endif -%}

=== modified file 'charmhelpers/contrib/openstack/templates/openstack_https_frontend'
--- charmhelpers/contrib/openstack/templates/openstack_https_frontend	2013-07-04 02:25:57 +0000
+++ charmhelpers/contrib/openstack/templates/openstack_https_frontend	2013-07-19 23:38:34 +0000
@@ -1,5 +1,5 @@
-{% if endpoints %}
-{% for ext, int in endpoints %}
+{% if endpoints -%}
+{% for ext, int in endpoints -%}
 Listen {{ ext }}
 NameVirtualHost *:{{ ext }}
 <VirtualHost *:{{ ext }}>
@@ -19,5 +19,5 @@
     Order allow,deny
     Allow from all
 </Location>
-{% endfor %}
-{% endif %}
+{% endfor -%}
+{% endif -%}

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2013-07-11 01:27:03 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2013-07-19 23:38:34 +0000
@@ -452,3 +452,22 @@
         # appropriate bits are b64decoded.
         decode = [call('SSL_CERT'), call('SSL_KEY'), call('CA_CERT')]
         self.assertEquals(decode, self.b64decode.call_args_list)
+
+    def test_image_service_context_missing_data(self):
+        '''Test image-service with missing relation and missing data'''
+        image_service = context.ImageServiceContext()
+        self.relation_ids.return_value = []
+        self.assertEquals({}, image_service())
+        self.relation_ids.return_value = ['image-service:0']
+        self.related_units.return_value = ['glance/0']
+        self.relation_get.return_value = None
+        self.assertEquals({}, image_service())
+
+    def test_image_service_context_with_data(self):
+        '''Test image-service with required data'''
+        image_service = context.ImageServiceContext()
+        self.relation_ids.return_value = ['image-service:0']
+        self.related_units.return_value = ['glance/0']
+        self.relation_get.return_value = 'http://glancehost:9292'
+        self.assertEquals({'glance_api_servers': 'http://glancehost:9292'},
+                          image_service())