Modify the definition of Neutron cluster when Contrail is installed
This change removes the Neutron agents AFD when Contrail plugin is used
to avoid reporting a DOWN status for Neutron. It also removes the
collect of the metrics of the Neutron agents.
Change-Id: I02ecb67489d244aca85bc4b1e3d4a5cd79df1b5b
Closes-Bug: #1546017
(cherry picked from commit 7d86ec48e6
)
This commit is contained in:
parent
5dbfa37bc3
commit
a7278433b3
@ -24,6 +24,7 @@ $rabbit = hiera_hash('rabbit')
|
|||||||
$management_vip = hiera('management_vip')
|
$management_vip = hiera('management_vip')
|
||||||
$storage_options = hiera_hash('storage', {})
|
$storage_options = hiera_hash('storage', {})
|
||||||
$murano = hiera_hash('murano')
|
$murano = hiera_hash('murano')
|
||||||
|
$contrail = hiera('contrail', false)
|
||||||
|
|
||||||
if $ceilometer['enabled'] {
|
if $ceilometer['enabled'] {
|
||||||
$notification_topics = ['notifications', 'lma_notifications']
|
$notification_topics = ['notifications', 'lma_notifications']
|
||||||
@ -342,12 +343,14 @@ if $lma_collector['influxdb_mode'] != 'disabled' {
|
|||||||
downtime_factor => 2,
|
downtime_factor => 2,
|
||||||
}
|
}
|
||||||
|
|
||||||
lma_collector::collectd::dbi_services { 'neutron':
|
unless $contrail {
|
||||||
username => 'neutron',
|
lma_collector::collectd::dbi_services { 'neutron':
|
||||||
dbname => 'neutron',
|
username => 'neutron',
|
||||||
password => $neutron['database']['passwd'],
|
dbname => 'neutron',
|
||||||
report_interval => 15,
|
password => $neutron['database']['passwd'],
|
||||||
downtime_factor => 4,
|
report_interval => 15,
|
||||||
|
downtime_factor => 4,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class { 'lma_collector::collectd::haproxy':
|
class { 'lma_collector::collectd::haproxy':
|
||||||
|
@ -19,6 +19,7 @@ if ($plugin_data) {
|
|||||||
$tls_enabled = hiera('public_ssl', false)
|
$tls_enabled = hiera('public_ssl', false)
|
||||||
$ceilometer = hiera_hash('ceilometer', {})
|
$ceilometer = hiera_hash('ceilometer', {})
|
||||||
$ceilometer_enabled = pick($ceilometer['enabled'], false)
|
$ceilometer_enabled = pick($ceilometer['enabled'], false)
|
||||||
|
$contrail_plugin = hiera('contrail', false)
|
||||||
|
|
||||||
$elasticsearch_mode = $plugin_data['elasticsearch_mode']
|
$elasticsearch_mode = $plugin_data['elasticsearch_mode']
|
||||||
$monitor_elasticsearch = $elasticsearch_mode ? {
|
$monitor_elasticsearch = $elasticsearch_mode ? {
|
||||||
|
@ -522,10 +522,12 @@ lma_collector:
|
|||||||
members:
|
members:
|
||||||
- neutron-logs
|
- neutron-logs
|
||||||
- neutron-api
|
- neutron-api
|
||||||
|
<% if not @contrail_plugin then -%>
|
||||||
- neutron-l3
|
- neutron-l3
|
||||||
- neutron-dhcp
|
- neutron-dhcp
|
||||||
- neutron-metadata
|
- neutron-metadata
|
||||||
- neutron-openvswitch
|
- neutron-openvswitch
|
||||||
|
<% end -%>
|
||||||
- controller
|
- controller
|
||||||
hints:
|
hints:
|
||||||
- keystone
|
- keystone
|
||||||
|
@ -149,6 +149,8 @@ These metrics are retrieved from the Neutron database.
|
|||||||
|
|
||||||
.. _network-agent-state-metrics:
|
.. _network-agent-state-metrics:
|
||||||
|
|
||||||
|
.. note:: These metrics are not collected when the Contrail plugin is deployed.
|
||||||
|
|
||||||
* ``openstack_neutron_agents``, the total number of Neutron agents by service
|
* ``openstack_neutron_agents``, the total number of Neutron agents by service
|
||||||
and state. The metric contains ``service`` (one of 'dhcp', 'l3', 'metadata'
|
and state. The metric contains ``service`` (one of 'dhcp', 'l3', 'metadata'
|
||||||
or 'openvswitch') and ``state`` (one of 'up', 'down' or 'disabled') fields.
|
or 'openvswitch') and ``state`` (one of 'up', 'down' or 'disabled') fields.
|
||||||
|
Loading…
Reference in New Issue
Block a user