From 3bb172b9888e545e6b92c2145ce76fa7d795e320 Mon Sep 17 00:00:00 2001
From: "Liang Chen liang.chen@canonical.com" <>
Date: Thu, 14 May 2015 14:26:07 -0400
Subject: [PATCH] remove unnecessary db config for nova-metadata-api

[cbjchen,r=]
nova-metadata-api only access db through nova-conductor.
And the db config was left wrong when db relation is
not ready.
---
 hooks/neutron_utils.py     | 4 +---
 templates/havana/nova.conf | 1 -
 tests/basic_deployment.py  | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/hooks/neutron_utils.py b/hooks/neutron_utils.py
index e4f75b31..72d36773 100644
--- a/hooks/neutron_utils.py
+++ b/hooks/neutron_utils.py
@@ -299,9 +299,7 @@ NOVA_CONF = "/etc/nova/nova.conf"
 
 NOVA_CONFIG_FILES = {
     NOVA_CONF: {
-        'hook_contexts': [context.SharedDBContext(ssl_dir=NOVA_CONF_DIR),
-                          context.PostgresqlDBContext(),
-                          NetworkServiceContext(),
+        'hook_contexts': [NetworkServiceContext(),
                           NeutronGatewayContext(),
                           SyslogContext(),
                           context.ZeroMQContext(),
diff --git a/templates/havana/nova.conf b/templates/havana/nova.conf
index da62c4a5..078a870f 100644
--- a/templates/havana/nova.conf
+++ b/templates/havana/nova.conf
@@ -12,7 +12,6 @@ use_syslog = {{ use_syslog }}
 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
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 8a59c510..d90b51e6 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -551,7 +551,6 @@ class QuantumGatewayBasicDeployment(OpenStackAmuletDeployment):
             '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',