Update the Nagios URL used to sent GSE and AFD

Implements: blueprint scalable-nagios-api
Depends-On: I55613dd650b039142767174d3f19fa9262a2a7bc

Conflicts:
	deployment_scripts/puppet/manifests/configure_afd_filters.pp
	deployment_scripts/puppet/manifests/controller.pp

Change-Id: I152dd8fcb0ec7dfddc99c8a52fa2098a414811c0
(cherry picked from commit 306448e8fa)

deployment_scripts/puppet/manifests/configure_afd_filters.pp

@@ -44,8 +44,8 @@ if $alerting_mode == 'remote' {
   $nagios_server = $nagios_nodes[0]['internal_address']
   $nagios_user = $lma_infra_alerting['nagios_user']
   $nagios_password = $lma_infra_alerting['nagios_password']
-  $http_port = $lma_collector::params::nagios_http_port
-  $http_path = $lma_collector::params::nagios_http_path
+  $http_port = '8001'
+  $http_path = 'status'
   $nagios_url = "http://${nagios_server}:${http_port}/${http_path}"
 } else {
   $nagios_enabled = false

deployment_scripts/puppet/manifests/controller.pp

@@ -195,8 +195,8 @@ if $alerting_mode != 'disabled' {
 
     # Important: $http_port and $http_path must match the
     # lma_infra_monitoring configuration.
-    $http_port = $lma_collector::params::nagios_http_port
-    $http_path = $lma_collector::params::nagios_http_path
+    $http_port = 8001
+    $http_path = 'status'
     $nagios_url = "http://${nagios_server}:${http_port}/${http_path}"
   } elsif $alerting_mode == 'standalone' {
     $use_nagios = false

deployment_scripts/puppet/modules/lma_collector/manifests/params.pp

@@ -177,8 +177,6 @@ class lma_collector::params {
   # Nagios parameters
   #
   $nagios_server = 'localhost'
-  $nagios_http_port = 8001
-  $nagios_http_path = 'cgi-bin/cmd.cgi'
   $nagios_user = 'nagiosadmin'
   $nagios_password = ''
   $nagios_timeout = 2