openstack/fuel-library
Code Issues Proposed changes

Merge "Neutron l3, dhcp, ovs, metadata agents now are independed."

Browse Source
This commit is contained in:
Jenkins 2015-06-19 16:44:54 +00:00 committed by Gerrit Code Review
commit f1fed17389
2 changed files with 10 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
deployment/puppet/cluster/manifests/neutron/dhcp.pp
View File

@ -16,18 +16,12 @@ class cluster::neutron::dhcp (
require cluster::neutron
if $multiple_agents {
Neutron_config<| name == 'DEFAULT/dhcp_agents_per_network' |> {
value => $agents_per_net
}
$csr_metadata = undef
$csr_complex_type = 'clone'
$csr_ms_metadata = { 'interleave' => 'true' }
} else {
$csr_metadata = { 'resource-stickiness' => '1' }
$csr_complex_type = undef
$csr_ms_metadata = undef
Neutron_config<| name == 'DEFAULT/dhcp_agents_per_network' |> {
value => $agents_per_net
}
$csr_metadata = undef
$csr_complex_type = 'clone'
$csr_ms_metadata = { 'interleave' => 'true' }
$dhcp_agent_package = $::neutron::params::dhcp_agent_package ? {
false => $::neutron::params::package_name,
@ -58,15 +52,4 @@ class cluster::neutron::dhcp (
hasrestart => false,
}
if ( 'ovs' in $ha_agents or 'ml2-ovs' in $ha_agents ) {
cluster::corosync::cs_with_service {'dhcp-and-ovs':
first => "clone_p_${::neutron::params::ovs_agent_service}",
second => $multiple_agents ? {
false => "p_${::neutron::params::dhcp_agent_service}",
default => "clone_p_${::neutron::params::dhcp_agent_service}"
},
require => Cluster::Corosync::Cs_service['ovs','dhcp']
}
}
}

41
deployment/puppet/cluster/manifests/neutron/l3.pp
View File

@ -18,18 +18,12 @@ define cluster::neutron::l3 (
require cluster::neutron
if $multiple_agents {
neutron_config{'DEFAULT/allow_automatic_l3agent_failover':
value => true
}
$csr_metadata = undef
$csr_complex_type = 'clone'
$csr_ms_metadata = { 'interleave' => 'true' }
} else {
$csr_metadata = { 'resource-stickiness' => '1' }
$csr_complex_type = undef
$csr_ms_metadata = undef
neutron_config{'DEFAULT/allow_automatic_l3agent_failover':
value => true
}
$csr_metadata = undef
$csr_complex_type = 'clone'
$csr_ms_metadata = { 'interleave' => 'true' }
$l3_agent_package = $::neutron::params::l3_agent_package ? {
false => $::neutron::params::package_name,
@ -61,29 +55,4 @@ define cluster::neutron::l3 (
primary => $primary,
hasrestart => false,
}
if ( 'ovs' in $ha_agents or 'ml2-ovs' in $ha_agents ) {
cluster::corosync::cs_with_service {'l3-and-ovs':
first => "clone_p_${::neutron::params::ovs_agent_service}",
second => $multiple_agents ? {
false => "p_${::neutron::params::l3_agent_service}",
default => "clone_p_${::neutron::params::l3_agent_service}"
},
require => Cluster::Corosync::Cs_service['ovs','l3'],
}
}
if ! $multiple_agents {
if 'dhcp' in $ha_agents {
cs_rsc_colocation { 'l3-keepaway-dhcp':
ensure => present,
score => '-100',
primitives => [
"p_${::neutron::params::dhcp_agent_service}",
"p_${::neutron::params::l3_agent_service}"
],
require => Cluster::Corosync::Cs_service['dhcp','l3'],
}
}
}
}