Fix neutron stamp/upgrade head

Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
This commit is contained in:
Bogdan Dobrelya 2015-08-06 13:40:23 +02:00
parent c746ecbb7a
commit b3c68cd47f
5 changed files with 23 additions and 2 deletions

View File

@ -5,6 +5,8 @@ This configures the plugin for the API server, but does nothing
about configuring the agents that must also run and share a config
file with the OVS plugin if both are on the same machine.
Note, this plugin was deprecated, you may want to use the ML2 plugin instead.
NB: don't need tunnel ID range when using VLANs,
*but* you do need the network vlan range regardless of type,
because the list of networks there is still important

View File

@ -8,3 +8,8 @@ package { 'neutron':
ensure => 'absent',
name => $::neutron::params::package_name,
}
# Remove external class dependency
Service <| title == 'neutron-plugin-ovs-service' |> {
require => undef
}

View File

@ -16,6 +16,8 @@ $network_vlan_ranges = $resource['input']['network_vlan_ranges']['value']
$tunnel_id_ranges = $resource['input']['tunnel_id_ranges']['value']
$vxlan_udp_port = $resource['input']['vxlan_udp_port']['value']
# Stamp neutron head, if current version is None, or upgrade head would fail later
$command = '/usr/bin/neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini'
class { 'neutron::plugins::ovs':
package_ensure => $package_ensure,
sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}",
@ -26,6 +28,13 @@ class { 'neutron::plugins::ovs':
network_vlan_ranges => $network_vlan_ranges,
tunnel_id_ranges => $tunnel_id_ranges,
vxlan_udp_port => $vxlan_udp_port,
} ->
exec { 'neutron-db-sync':
provider => 'shell',
command => "${command} stamp head",
path => [ '/usr/bin', '/bin' ],
onlyif => "${command} current | grep -qE '^Current revision.*None$' "
}
include neutron::params

View File

@ -3,3 +3,8 @@ class { 'neutron::server':
package_ensure => 'absent',
auth_password => 'not important as removed',
}
# Remove external class dependency
Service <| title == 'neutron-server' |> {
require => undef
}