starlingx
/
config
Code Issues Proposed changes

Disable raise/get/clear NFV alarm to container fm-rest-api 

add puppet parameters and write to nfv config file to
disable raise/get/clear NFV alarm to container fm-rest-api service

Story: 2004008
Task: 33573
Depends-On: https://review.opendev.org/#/c/658972/
Change-Id: I3ab37fe476ad083b5c8acca2684973eec30b8005
Signed-off-by: Sun Austin <austin.sun@intel.com>
This commit is contained in:
Sun Austin 2019-06-04 09:13:59 +08:00
parent 4f406285e4
commit 384854568c
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
puppet-modules-wrs/puppet-nfv/src/nfv/manifests/alarm.pp
View File

@ -20,6 +20,7 @@ class nfv::alarm (
$fault_mgmt_service_type = 'faultmanagement',
$fault_mgmt_endpoint_type = 'admin',
$fault_mgmt_endpoint_disabled = false,
$fault_management_pod_disabled = true,
) {
include nfv::params
@ -27,6 +28,9 @@ class nfv::alarm (
nfv_plugin_alarm_config {
# File-Storage Information
'File-Storage/file': value => $storage_file;
# This flag is used to disable raising alarm to containerized fm
# and will be removed in future.
'openstack/fault_management_pod_disabled': value => $fault_management_pod_disabled;
# OpenStack Authentication Information
'openstack/username': value => $openstack_username;

4
puppet-modules-wrs/puppet-nfv/src/nfv/manifests/event_log.pp
View File

@ -20,6 +20,7 @@ class nfv::event_log (
$fault_mgmt_service_type = 'faultmanagement',
$fault_mgmt_endpoint_type = 'admin',
$fault_mgmt_endpoint_disabled = false,
$fault_management_pod_disabled = true,
) {
include nfv::params
@ -27,6 +28,9 @@ class nfv::event_log (
nfv_plugin_event_log_config {
# File-Storage Information
'File-Storage/file': value => $storage_file;
# This flag is used to disable raising alarm to containerized fm
# and will be removed in future.
'openstack/fault_management_pod_disabled': value => $fault_management_pod_disabled;
# OpenStack Authentication Information
'openstack/username': value => $openstack_username;

4
puppet-modules-wrs/puppet-nfv/src/nfv/manifests/vim.pp
View File

@ -26,6 +26,7 @@ class nfv::vim (
$network_plugin_disabled = false,
$guest_plugin_disabled = false,
$fault_mgmt_plugin_disabled = false,
$fault_management_pod_disabled = true,
$vim_rpc_ip = '127.0.0.1',
$vim_rpc_port = 4343,
$vim_api_ip = '0.0.0.0',
@ -72,6 +73,9 @@ class nfv::vim (
'nfvi/network_plugin_disabled': value => $network_plugin_disabled;
'nfvi/guest_plugin_disabled': value => $guest_plugin_disabled;
'nfvi/fault_mgmt_plugin_disabled': value => $fault_mgmt_plugin_disabled;
# This flag is used to disable raising alarm to containerized fm
# and will be removed in future.
'nfvi/fault_management_pod_disabled': value => $fault_management_pod_disabled;
# INSTANCE CONFIGURATION
'instance-configuration/max_live_migrate_wait_in_secs': value => $instance_max_live_migrate_wait_in_secs;

5
sysinv/sysinv/sysinv/sysinv/puppet/nfv.py
View File

@ -78,6 +78,11 @@ class NfvPuppet(openstack.OpenstackBasePuppet):
'nfv::vim::vim_webserver_ip': self._get_oam_address(),
'nfv::vim::instance_single_hypervisor': single_hypervisor,
'nfv::vim::sw_mgmt_single_controller': single_controller,
# This flag is used to disable raising alarm to containerized fm
# and will be removed in future.
'nfv::alarm::fault_management_pod_disabled': True,
'nfv::event_log::fault_management_pod_disabled': True,
'nfv::vim::fault_management_pod_disabled': True,
'platform::nfv::params::service_create':
self._to_create_services(),