From ebab9a4800f1db666bba0611438e14cd88abf35c Mon Sep 17 00:00:00 2001 From: Sundaresan Rajangam Date: Wed, 22 Feb 2017 11:28:58 -0800 Subject: [PATCH] Move api_server_list option under [API_SERVER] Change-Id: I421fb96ad5f462516c1650a1143b4ba19fcfe3ed Partial-Bug: #1663306 --- .../modules/contrail/manifests/collector/config.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrail/environment/modules/contrail/manifests/collector/config.pp b/contrail/environment/modules/contrail/manifests/collector/config.pp index 0bfa1271..f5915c21 100644 --- a/contrail/environment/modules/contrail/manifests/collector/config.pp +++ b/contrail/environment/modules/contrail/manifests/collector/config.pp @@ -119,8 +119,8 @@ 'DEFAULT/analytics_config_audit_ttl' : value => $analytics_config_audit_ttl; 'DEFAULT/analytics_statistics_ttl' : value => $analytics_statistics_ttl; 'DEFAULT/analytics_flow_ttl' : value => $analytics_flow_ttl; - 'DEFAULT/api_server_list' : value => $api_server_list; 'COLLECTOR/port' : value => '8086'; + 'API_SERVER/api_server_list' : value => $api_server_list; 'REDIS/port' : value => '6379'; 'REDIS/server' : value => '127.0.0.1'; } -> @@ -133,8 +133,8 @@ 'DEFAULTS/scan_frequency' : value => $snmp_scan_frequency; 'DEFAULTS/fast_scan_frequency': value => $snmp_fast_scan_frequency; 'DEFAULTS/http_server_port' : value => '5920'; - 'DEFAULTS/api_server_list' : value => $api_server_list; 'DEFAULTS/collectors' : value => $collector_ip_port_list; + 'API_SERVER/api_server_list' : value => $api_server_list; } -> contrail_analytics_nodemgr_config { @@ -154,9 +154,9 @@ 'DEFAULTS/log_local' : value => '1'; 'DEFAULTS/log_level' : value => 'SYS_NOTICE'; 'DEFAULTS/log_file' : value => '/var/log/contrail/contrail-alarm-gen.log'; - 'DEFAULTS/api_server_list' : value => $api_server_list; 'DEFAULTS/collectors' : value => $collector_ip_port_list; 'REDIS/redis_uve_list' : value => $redis_server_list; + 'API_SERVER/api_server_list' : value => $api_server_list; } -> contrail_topology_config { @@ -165,8 +165,8 @@ 'DEFAULTS/log_level' : value => 'SYS_NOTICE'; 'DEFAULTS/log_file' : value => '/var/log/contrail/contrail-topology.log'; 'DEFAULTS/scan_frequency' : value => $topology_scan_frequency; - 'DEFAULTS/api_server_list' : value => $api_server_list; 'DEFAULTS/collectors' : value => $collector_ip_port_list; + 'API_SERVER/api_server_list' : value => $api_server_list; } -> contrail_alarm_gen_ini_config {