From 4a197c26fab9ec297c64f05ebe94cbc4139c3fc1 Mon Sep 17 00:00:00 2001 From: Gael Chamoulaud Date: Wed, 29 Jul 2015 16:20:28 +0200 Subject: [PATCH] [neutron] Avoid running neutron-db-manage twice - L3 Router service plugin will be always present into SERVICE_PLUGINS list, so packstack is running neutron-db-manage twice. Change-Id: Ia1d8f14f85f1861e52d9359dd71b265e091ddb46 Signed-off-by: Gael Chamoulaud --- packstack/puppet/templates/neutron_api.pp | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/packstack/puppet/templates/neutron_api.pp b/packstack/puppet/templates/neutron_api.pp index 06ff7215f..3561a50f8 100644 --- a/packstack/puppet/templates/neutron_api.pp +++ b/packstack/puppet/templates/neutron_api.pp @@ -1,27 +1,10 @@ -if hiera_array('SERVICE_PLUGINS') != undef { - $service_sync_db = true -} -else { - $service_sync_db = false -} - - class { '::neutron::server': database_connection => $neutron_sql_connection, auth_password => $neutron_user_password, auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'), identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'), - sync_db => $service_sync_db, + sync_db => true, enabled => true, } -exec { 'neutron-db-manage upgrade': - command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini upgrade head', - path => '/usr/bin', - user => 'neutron', - logoutput => 'on_failure', - before => Service['neutron-server'], - require => [Neutron_config['database/connection'], Neutron_config['DEFAULT/core_plugin']], -} -