From 7d217dfc108a7f62e68973a8cb782da3209d62d4 Mon Sep 17 00:00:00 2001 From: SidneyAn Date: Wed, 23 Oct 2019 13:54:06 +0800 Subject: [PATCH] Revert "remove flag fault_management_pod_disabled" This reverts commit 62f425d67322aaac0bb8507e67e0eafa2b74c970. feature FM containerization is delayed to stx 4.0. Switch the openstack alarms reported to fm in platform instead of fm in containers Change-Id: If95f3b472d7d83ff526299588ee14a0678691551 Signed-off-by: SidneyAn --- modules/puppet-nfv/src/nfv/manifests/alarm.pp | 4 ++++ modules/puppet-nfv/src/nfv/manifests/event_log.pp | 4 ++++ modules/puppet-nfv/src/nfv/manifests/vim.pp | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/modules/puppet-nfv/src/nfv/manifests/alarm.pp b/modules/puppet-nfv/src/nfv/manifests/alarm.pp index 6273aed1c..a465ffb9c 100644 --- a/modules/puppet-nfv/src/nfv/manifests/alarm.pp +++ b/modules/puppet-nfv/src/nfv/manifests/alarm.pp @@ -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; diff --git a/modules/puppet-nfv/src/nfv/manifests/event_log.pp b/modules/puppet-nfv/src/nfv/manifests/event_log.pp index 9c15a4d94..f295ade90 100644 --- a/modules/puppet-nfv/src/nfv/manifests/event_log.pp +++ b/modules/puppet-nfv/src/nfv/manifests/event_log.pp @@ -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; diff --git a/modules/puppet-nfv/src/nfv/manifests/vim.pp b/modules/puppet-nfv/src/nfv/manifests/vim.pp index ae0211bc0..fa299afa1 100644 --- a/modules/puppet-nfv/src/nfv/manifests/vim.pp +++ b/modules/puppet-nfv/src/nfv/manifests/vim.pp @@ -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;