x
/
packstack
Code Issues Proposed changes

Upgrade DB before neutron server starts 

Change-Id: Iaa2717fd093a3e675048ea0cd26a10126d09b59f
Fixes:: rhbz#1037675
This commit is contained in:
Martin Magr 2013-12-09 16:56:23 +01:00
parent fb1df049a4
commit 2e072bffa2
6 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packstack/plugins/neutron_350.py
View File

@ -106,7 +106,7 @@ def initConfig(controllerObject):
"PROMPT" : "Enter a comma separated list of IP addresses on which to install Neutron LBaaS agent",
"OPTION_LIST" : [],
"VALIDATORS" : [validators.validate_multi_ssh],
"DEFAULT_VALUE" : "",
"DEFAULT_VALUE" : utils.get_localhost_ip(),
"MASK_INPUT" : False,
"LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_NEUTRON_LBAAS_HOSTS",

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

@ -1,6 +1,16 @@
class { 'neutron::server':
sql_connection => $neutron_sql_connection,
connection => $neutron_sql_connection,
auth_password => $neutron_user_password,
auth_host => '%(CONFIG_KEYSTONE_HOST)s',
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'],
}

1
packstack/puppet/templates/neutron_lb_plugin.pp
View File

@ -1,5 +1,4 @@
class { 'neutron::plugins::linuxbridge':
tenant_network_type => '%(CONFIG_NEUTRON_LB_TENANT_NETWORK_TYPE)s',
network_vlan_ranges => '%(CONFIG_NEUTRON_LB_VLAN_RANGES)s',
sql_connection => $neutron_sql_connection
}

1
packstack/puppet/templates/neutron_ovs_plugin_gre.pp
View File

@ -2,5 +2,4 @@ class { 'neutron::plugins::ovs':
tenant_network_type => '%(CONFIG_NEUTRON_OVS_TENANT_NETWORK_TYPE)s',
network_vlan_ranges => '%(CONFIG_NEUTRON_OVS_VLAN_RANGES)s',
tunnel_id_ranges => '%(CONFIG_NEUTRON_OVS_TUNNEL_RANGES)s',
sql_connection => $neutron_sql_connection
}

1
packstack/puppet/templates/neutron_ovs_plugin_local.pp
View File

@ -1,5 +1,4 @@
class { 'neutron::plugins::ovs':
tenant_network_type => '%(CONFIG_NEUTRON_OVS_TENANT_NETWORK_TYPE)s',
network_vlan_ranges => '%(CONFIG_NEUTRON_OVS_VLAN_RANGES)s',
sql_connection => $neutron_sql_connection
}

1
packstack/puppet/templates/neutron_ovs_plugin_vlan.pp
View File

@ -1,5 +1,4 @@
class { 'neutron::plugins::ovs':
tenant_network_type => '%(CONFIG_NEUTRON_OVS_TENANT_NETWORK_TYPE)s',
network_vlan_ranges => '%(CONFIG_NEUTRON_OVS_VLAN_RANGES)s',
sql_connection => $neutron_sql_connection
}