Merge lp:~yolanda.robla/charms/precise/heat/postgresql into lp:~openstack-charmers-archive/charms/precise/heat/trunk

[Yolanda Robla]

added postgresql

[James Page (james-page)]

OK _ needs twiddling as currently no heat icehouse branch.

Unmerged revisions

24. By Yolanda Robla on 2014-03-26

resync charmhelper

23. By Yolanda Robla on 2014-03-26

added postgresql support

=== modified file 'hooks/charmhelpers/contrib/hahelpers/cluster.py'
--- hooks/charmhelpers/contrib/hahelpers/cluster.py	2013-11-21 09:41:44 +0000
+++ hooks/charmhelpers/contrib/hahelpers/cluster.py	2014-03-26 09:39:55 +0000
@@ -126,17 +126,17 @@
     return public_port - (i * 10)
 
 
-def determine_haproxy_port(public_port):
+def determine_apache_port(public_port):
     '''
-    Description: Determine correct proxy listening port based on public IP +
-    existence of HTTPS reverse proxy.
+    Description: Determine correct apache listening port based on public IP +
+    state of the cluster.
 
     public_port: int: standard public port for given service
 
     returns: int: the correct listening port for the HAProxy service
     '''
     i = 0
-    if https():
+    if len(peer_units()) > 0 or is_clustered():
         i += 1
     return public_port - (i * 10)
 

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2014-02-14 13:58:56 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2014-03-26 09:39:55 +0000
@@ -26,11 +26,10 @@
 )
 
 from charmhelpers.contrib.hahelpers.cluster import (
+    determine_apache_port,
     determine_api_port,
-    determine_haproxy_port,
     https,
-    is_clustered,
-    peer_units,
+    is_clustered
 )
 
 from charmhelpers.contrib.hahelpers.apache import (
@@ -147,6 +146,36 @@
                     'database': self.database,
                     'database_user': self.user,
                     'database_password': passwd,
+                    'database_type': 'mysql',
+                }
+                if context_complete(ctxt):
+                    return ctxt
+        return {}
+
+
+class PostgresqlDBContext(OSContextGenerator):
+    interfaces = ['pgsql-db']
+
+    def __init__(self, database=None):
+        self.database = database
+
+    def __call__(self):
+        self.database = self.database or config('database')
+        if self.database is None:
+            log('Could not generate postgresql_db context. '
+                'Missing required charm config options. '
+                '(database name)')
+            raise OSContextError
+        ctxt = {}
+
+        for rid in relation_ids(self.interfaces[0]):
+            for unit in related_units(rid):
+                ctxt = {
+                    'database_host': relation_get('host', rid=rid, unit=unit),
+                    'database': self.database,
+                    'database_user': relation_get('user', rid=rid, unit=unit),
+                    'database_password': relation_get('password', rid=rid, unit=unit),
+                    'database_type': 'postgresql',
                 }
                 if context_complete(ctxt):
                     return ctxt
@@ -218,7 +247,12 @@
                     # Sufficient information found = break out!
                     break
             # Used for active/active rabbitmq >= grizzly
-            if 'clustered' not in ctxt and len(related_units(rid)) > 1:
+            if ('clustered' not in ctxt or relation_get('ha-vip-only') == 'True') and \
+               len(related_units(rid)) > 1:
+                if relation_get('ha_queues'):
+                    ctxt['rabbitmq_ha_queues'] = relation_get('ha_queues')
+                else:
+                    ctxt['rabbitmq_ha_queues'] = False
                 rabbitmq_hosts = []
                 for unit in related_units(rid):
                     rabbitmq_hosts.append(relation_get('private-address',
@@ -237,10 +271,13 @@
         '''This generates context for /etc/ceph/ceph.conf templates'''
         if not relation_ids('ceph'):
             return {}
+
         log('Generating template context for ceph')
+
         mon_hosts = []
         auth = None
         key = None
+        use_syslog = str(config('use-syslog')).lower()
         for rid in relation_ids('ceph'):
             for unit in related_units(rid):
                 mon_hosts.append(relation_get('private-address', rid=rid,
@@ -252,6 +289,7 @@
             'mon_hosts': ' '.join(mon_hosts),
             'auth': auth,
             'key': key,
+            'use_syslog': use_syslog
         }
 
         if not os.path.isdir('/etc/ceph'):
@@ -380,17 +418,15 @@
             'private_address': unit_get('private-address'),
             'endpoints': []
         }
-        for ext_port in self.external_ports:
-            if peer_units() or is_clustered():
-                int_port = determine_haproxy_port(ext_port)
-            else:
-                int_port = determine_api_port(ext_port)
+        for api_port in self.external_ports:
+            ext_port = determine_apache_port(api_port)
+            int_port = determine_api_port(api_port)
             portmap = (int(ext_port), int(int_port))
             ctxt['endpoints'].append(portmap)
         return ctxt
 
 
-class NeutronContext(object):
+class NeutronContext(OSContextGenerator):
     interfaces = []
 
     @property
@@ -451,6 +487,22 @@
 
         return nvp_ctxt
 
+    def neutron_ctxt(self):
+        if https():
+            proto = 'https'
+        else:
+            proto = 'http'
+        if is_clustered():
+            host = config('vip')
+        else:
+            host = unit_get('private-address')
+        url = '%s://%s:%s' % (proto, host, '9696')
+        ctxt = {
+            'network_manager': self.network_manager,
+            'neutron_url': url,
+        }
+        return ctxt
+
     def __call__(self):
         self._ensure_packages()
 
@@ -460,7 +512,7 @@
         if not self.plugin:
             return {}
 
-        ctxt = {'network_manager': self.network_manager}
+        ctxt = self.neutron_ctxt()
 
         if self.plugin == 'ovs':
             ctxt.update(self.ovs_ctxt())
@@ -586,6 +638,7 @@
 
 
 class SyslogContext(OSContextGenerator):
+
     def __call__(self):
         ctxt = {
             'use_syslog': config('use-syslog')

=== added file 'hooks/heat_context.pyc'
Binary files hooks/heat_context.pyc	1970-01-01 00:00:00 +0000 and hooks/heat_context.pyc	2014-03-26 09:39:55 +0000 differ
=== modified file 'hooks/heat_relations.py'
--- hooks/heat_relations.py	2013-12-04 17:04:42 +0000
+++ hooks/heat_relations.py	2014-03-26 09:39:55 +0000
@@ -18,7 +18,9 @@
     UnregisteredHookError,
     config,
     charm_dir,
+    is_relation_made,
     log,
+    ERROR,
     relation_set,
     open_port,
     unit_get
@@ -101,11 +103,30 @@
 
 @hooks.hook('shared-db-relation-joined')
 def db_joined():
+    if is_relation_made('pgsql-db'):
+        # error, postgresql is used
+        e = ('Attempting to associate a mysql database when there is already '
+             'associated a postgresql one')
+        log(e, level=ERROR)
+        raise Exception(e)
+
     relation_set(heat_database=config('database'),
                  heat_username=config('database-user'),
                  heat_hostname=unit_get('private-address'))
 
 
[e-mail]('pgsql-db-relation-joined')
+def pgsql_db_joined():
+    if is_relation_made('shared-db'):
+        # raise error
+        e = ('Attempting to associate a postgresql database when there is already '
+             'associated a mysql one')
+        log(e, level=ERROR)
+        raise Exception(e)
+
+    relation_set(database=config('database'))
+
+
 @hooks.hook('shared-db-relation-changed')
 @restart_on_change(restart_map())
 def db_changed():
@@ -116,6 +137,16 @@
     check_call(['heat-manage', 'db_sync'])
 
 
[e-mail]('pgsql-db-relation-changed')
+@restart_on_change(restart_map())
+def pgsql_db_changed():
+    if 'pgsql-db' not in CONFIGS.complete_contexts():
+        log('pgsql-db relation incomplete. Peer not ready?')
+        return
+    CONFIGS.write(HEAT_CONF)
+    check_call(['heat-manage', 'db_sync'])
+
+
 @hooks.hook('identity-service-relation-joined')
 def identity_joined(rid=None):
     base_url = canonical_url(CONFIGS)
@@ -149,7 +180,8 @@
 
 @hooks.hook('amqp-relation-broken',
             'identity-service-relation-broken',
-            'shared-db-relation-broken')
+            'shared-db-relation-broken',
+            'pgsql-db-relation-broken')
 def relation_broken():
     CONFIGS.write_all()
 

=== added file 'hooks/heat_relations.pyc'
Binary files hooks/heat_relations.pyc	1970-01-01 00:00:00 +0000 and hooks/heat_relations.pyc	2014-03-26 09:39:55 +0000 differ
=== modified file 'hooks/heat_utils.py'
--- hooks/heat_utils.py	2014-02-14 13:58:56 +0000
+++ hooks/heat_utils.py	2014-03-26 09:39:55 +0000
@@ -30,6 +30,7 @@
 
 BASE_PACKAGES = [
     'python-keystoneclient',
+    'python-psycopg2',
     'uuid',
 ]
 
@@ -52,6 +53,7 @@
         'services': BASE_SERVICES,
         'contexts': [context.AMQPContext(),
                      context.SharedDBContext(relation_prefix='heat'),
+                     context.PostgresqlDBContext(),
                      context.OSConfigFlagContext(),
                      heat_context.HeatIdentityServiceContext(),
                      heat_context.EncryptionContext(),

=== added file 'hooks/heat_utils.pyc'
Binary files hooks/heat_utils.pyc	1970-01-01 00:00:00 +0000 and hooks/heat_utils.pyc	2014-03-26 09:39:55 +0000 differ
=== added symlink 'hooks/pgsql-db-relation-broken'
=== target is u'heat_relations.py'
=== added symlink 'hooks/pgsql-db-relation-changed'
=== target is u'heat_relations.py'
=== added symlink 'hooks/pgsql-db-relation-joined'
=== target is u'heat_relations.py'
=== modified file 'metadata.yaml'
--- metadata.yaml	2013-11-29 15:36:45 +0000
+++ metadata.yaml	2014-03-26 09:39:55 +0000
@@ -13,6 +13,8 @@
 requires:
   shared-db:
     interface: mysql-shared
+  pgsql-db:
+    interface: pgsql
   amqp:
     interface: rabbitmq
   identity-service:

=== modified file 'revision'
--- revision	2014-02-03 13:05:03 +0000
+++ revision	2014-03-26 09:39:55 +0000
@@ -1,1 +1,1 @@
-12
+13

=== modified file 'templates/heat.conf'
--- templates/heat.conf	2014-02-03 13:05:03 +0000
+++ templates/heat.conf	2014-03-26 09:39:55 +0000
@@ -37,7 +37,7 @@
 {% endif -%}
 
 {% if database_host -%}
-sql_connection = mysql://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}
+sql_connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}
 {% endif -%}
 
 verbose = True
@@ -60,7 +60,7 @@
 
 # sql
 {% if database_host -%}
-connection = mysql://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}
+connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}
 {% endif -%}
 
 [paste_deploy]

=== modified file 'unit_tests/test_heat_relations.py'
--- unit_tests/test_heat_relations.py	2013-12-11 11:21:44 +0000
+++ unit_tests/test_heat_relations.py	2014-03-26 09:39:55 +0000
@@ -20,6 +20,7 @@
     'Hooks',
     'canonical_url',
     'config',
+    'is_relation_made',
     'open_port',
     'relation_set',
     'unit_get',
@@ -77,18 +78,49 @@
 
     def test_db_joined(self):
         self.unit_get.return_value = 'heat.foohost.com'
+        self.is_relation_made.return_value = False
         relations.db_joined()
         self.relation_set.assert_called_with(heat_database='heat',
                                              heat_username='heat',
                                              heat_hostname='heat.foohost.com')
         self.unit_get.assert_called_with('private-address')
 
+    def test_postgresql_db_joined(self):
+        self.unit_get.return_value = 'heat.foohost.com'
+        self.is_relation_made.return_value = False
+        relations.pgsql_db_joined()
+        self.relation_set.assert_called_with(database='heat')
+
+    def test_db_joined_with_postgres(self):
+        self.unit_get.return_value = 'heat.foohost.com'
+        self.is_relation_made.return_value = True
+        with self.assertRaises(Exception) as context:
+            relations.db_joined()
+        self.assertEqual(context.exception.message,
+            'Attempting to associate a mysql database when there '
+            'is already associated a postgresql one')
+
+    def test_postgresql_joined_with_db(self):
+        self.unit_get.return_value = 'heat.foohost.com'
+        self.is_relation_made.return_value = True
+        with self.assertRaises(Exception) as context:
+            relations.pgsql_db_joined()
+        self.assertEqual(context.exception.message,
+            'Attempting to associate a postgresql database when there '
+            'is already associated a mysql one')
+
     def _shared_db_test(self, configs):
         configs.complete_contexts = MagicMock()
         configs.complete_contexts.return_value = ['shared-db']
         configs.write = MagicMock()
         relations.db_changed()
 
+    def _postgresql_db_test(self, configs):
+        configs.complete_contexts = MagicMock()
+        configs.complete_contexts.return_value = ['pgsql-db']
+        configs.write = MagicMock()
+        relations.pgsql_db_changed()
+
     @patch.object(relations, 'CONFIGS')
     def test_db_changed(self, configs):
         self._shared_db_test(configs)
@@ -96,6 +128,12 @@
                           configs.write.call_args_list)
 
     @patch.object(relations, 'CONFIGS')
+    def test_pgsql_db_changed(self, configs):
+        self._postgresql_db_test(configs)
+        self.assertEquals([call('/etc/heat/heat.conf')],
+                          configs.write.call_args_list)
+
+    @patch.object(relations, 'CONFIGS')
     def test_db_changed_missing_relation_data(self, configs):
         configs.complete_contexts = MagicMock()
         configs.complete_contexts.return_value = []
@@ -104,6 +142,15 @@
             'shared-db relation incomplete. Peer not ready?'
         )
 
+    @patch.object(relations, 'CONFIGS')
+    def test_pgsql_db_changed_missing_relation_data(self, configs):
+        configs.complete_contexts = MagicMock()
+        configs.complete_contexts.return_value = []
+        relations.pgsql_db_changed()
+        self.log.assert_called_with(
+            'pgsql-db relation incomplete. Peer not ready?'
+        )
+
     def test_amqp_joined(self):
         relations.amqp_joined()
         self.relation_set.assert_called_with(