starlingx/stx-puppet
Code Issues Proposed changes

Revert "remove flag fault_management_pod_disabled"

Browse Source 
This reverts commit 62f425d673.

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 <ran1.an@intel.com>
This commit is contained in:
SidneyAn 2019-10-23 13:54:06 +08:00
parent c92e700ab1
commit 7d217dfc10
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/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
modules/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
modules/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;