Merge lp:~cbjchen/charms/trusty/neutron-gateway/metadata-api-config-fix into lp:~openstack-charmers-archive/charms/trusty/neutron-gateway/next

[Liang Chen]

Remove unnecessary db config for nova-metadata-api. Since nova-metadata-api only access db through nova-conductor, and the db config was left wrong when db relation is not ready.

[James Page (james-page)]

This generally looks fine, but please can add

review: Approve

=== modified file 'hooks/neutron_utils.py'
--- hooks/neutron_utils.py	2015-05-07 09:33:38 +0000
+++ hooks/neutron_utils.py	2015-05-14 18:34:10 +0000
@@ -299,9 +299,7 @@
 
 NOVA_CONFIG_FILES = {
     NOVA_CONF: {
-        'hook_contexts': [context.SharedDBContext(ssl_dir=NOVA_CONF_DIR),
-                          context.PostgresqlDBContext(),
-                          NetworkServiceContext(),
+        'hook_contexts': [NetworkServiceContext(),
                           NeutronGatewayContext(),
                           SyslogContext(),
                           context.ZeroMQContext(),

=== modified file 'templates/havana/nova.conf'
--- templates/havana/nova.conf	2014-09-10 10:24:49 +0000
+++ templates/havana/nova.conf	2015-05-14 18:34:10 +0000
@@ -12,7 +12,6 @@
 api_paste_config=/etc/nova/api-paste.ini
 enabled_apis=metadata
 multi_host=True
-{% include "parts/database" %}
 neutron_metadata_proxy_shared_secret={{ shared_secret }}
 service_neutron_metadata_proxy=True
 # Access to message bus

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-04-24 10:07:10 +0000
+++ tests/basic_deployment.py	2015-05-14 18:34:10 +0000
@@ -551,7 +551,6 @@
             'api_paste_config': '/etc/nova/api-paste.ini',
             'enabled_apis': 'metadata',
             'multi_host': 'True',
-            'sql_connection': db_uri,
             'service_neutron_metadata_proxy': 'True',
             'rabbit_userid': 'neutron',
             'rabbit_virtual_host': 'openstack',