x/packstack
Code Issues Proposed changes

Merge "[neutron] Avoid running neutron-db-manage twice"

Browse Source
This commit is contained in:
Jenkins
2015-07-31 07:07:12 +00:00
committed by Gerrit Code Review
parent eac7955c19 4a197c26fa
commit af04b073d8
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packstack/puppet/templates/neutron_api.pp
View File

@@ -1,27 +1,10 @@
if hiera_array('SERVICE_PLUGINS') != undef {
$service_sync_db = true
}
else {
$service_sync_db = false
}
class { '::neutron::server': class { '::neutron::server':
database_connection => $neutron_sql_connection, database_connection => $neutron_sql_connection,
auth_password => $neutron_user_password, auth_password => $neutron_user_password,
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'), auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'), identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
sync_db => $service_sync_db, sync_db => true,
enabled => 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']],
}