Fix Cinder local endpoint check
Since Mitaka, Cinder returns 300 instead of 200 in previous releases Change-Id: Ia1e35da330754d5dc21573d3b469cb708ca28d28
This commit is contained in:
parent
e0eb164cf3
commit
973c62b04b
|
@ -17,6 +17,7 @@ notice('fuel-plugin-lma-collector: collectd.pp')
|
||||||
if hiera('lma::collector::influxdb::server', false) {
|
if hiera('lma::collector::influxdb::server', false) {
|
||||||
prepare_network_config(hiera_hash('network_scheme', {}))
|
prepare_network_config(hiera_hash('network_scheme', {}))
|
||||||
|
|
||||||
|
$fuel_version = 0 + hiera('fuel_version')
|
||||||
$management_vip = hiera('management_vip')
|
$management_vip = hiera('management_vip')
|
||||||
$mgmt_address = get_network_role_property('management', 'ipaddr')
|
$mgmt_address = get_network_role_property('management', 'ipaddr')
|
||||||
$lma_collector = hiera_hash('lma_collector')
|
$lma_collector = hiera_hash('lma_collector')
|
||||||
|
@ -119,7 +120,6 @@ if hiera('lma::collector::influxdb::server', false) {
|
||||||
}
|
}
|
||||||
# Deal with detach-* plugins
|
# Deal with detach-* plugins
|
||||||
if $is_mysql_server {
|
if $is_mysql_server {
|
||||||
$fuel_version = 0 + hiera('fuel_version')
|
|
||||||
if $fuel_version < 9.0 {
|
if $fuel_version < 9.0 {
|
||||||
$mysql_resource_name = 'p_mysql'
|
$mysql_resource_name = 'p_mysql'
|
||||||
} else {
|
} else {
|
||||||
|
@ -251,6 +251,12 @@ if hiera('lma::collector::influxdb::server', false) {
|
||||||
$neutron_api = get_network_role_property('neutron/api', 'ipaddr')
|
$neutron_api = get_network_role_property('neutron/api', 'ipaddr')
|
||||||
$nova_api = get_network_role_property('nova/api', 'ipaddr')
|
$nova_api = get_network_role_property('nova/api', 'ipaddr')
|
||||||
$swift_api = get_network_role_property('swift/api', 'ipaddr')
|
$swift_api = get_network_role_property('swift/api', 'ipaddr')
|
||||||
|
if $fuel_version < 9.0 {
|
||||||
|
$cinder_expected_code = 200
|
||||||
|
} else {
|
||||||
|
# Since Mitaka, Cinder returns 300 instead of 200 in previous releases
|
||||||
|
$cinder_expected_code = 300
|
||||||
|
}
|
||||||
class { 'lma_collector::collectd::check_local_endpoint':
|
class { 'lma_collector::collectd::check_local_endpoint':
|
||||||
urls => {
|
urls => {
|
||||||
'cinder-api' => "http://${cinder_api}:8776",
|
'cinder-api' => "http://${cinder_api}:8776",
|
||||||
|
@ -263,7 +269,7 @@ if hiera('lma::collector::influxdb::server', false) {
|
||||||
'swift-api' => "http://${swift_api}:8080/info",
|
'swift-api' => "http://${swift_api}:8080/info",
|
||||||
},
|
},
|
||||||
expected_codes => {
|
expected_codes => {
|
||||||
'cinder-api' => 300,
|
'cinder-api' => $cinder_expected_code,
|
||||||
'glance-api' => 300,
|
'glance-api' => 300,
|
||||||
'heat-api' => 300,
|
'heat-api' => 300,
|
||||||
'heat-cfn-api' => 300,
|
'heat-cfn-api' => 300,
|
||||||
|
|
Loading…
Reference in New Issue