Drop surplus configuration of database for nova-metadata-api.

This commit is contained in:
James Page 2015-06-10 15:31:00 +01:00
commit 65a7151925
3 changed files with 1 additions and 5 deletions

View File

@ -303,9 +303,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(),

View File

@ -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

View File

@ -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',