Merge "Remove dcorch-snmp"

modules/puppet-dcorch/src/dcorch/manifests/params.pp

@@ -20,8 +20,6 @@ class dcorch::params {
     $api_service           = 'dcorch-api'
     $engine_package        = 'distributedcloud-dcorch'
     $engine_service        = 'dcorch-engine'
-    $snmp_package          = 'distributedcloud-dcorch'
-    $snmp_service          = 'dcorch-snmp'
     $api_proxy_package      = 'distributedcloud-dcorch'
     $api_proxy_service      = 'dcorch-api-proxy'
 
@@ -35,8 +33,6 @@ class dcorch::params {
     $api_service           = 'dcorch-api'
     $engine_package        = false
     $engine_service        = 'dcorch-engine'
-    $snmp_package          = false
-    $snmp_service          = 'dcorch-snmp'
     $api_proxy_package      = false
     $api_proxy_service      = 'dcorch-api-proxy'
 
@@ -48,8 +44,6 @@ class dcorch::params {
     $client_package        = 'distributedcloud-client-dcorchclient'
     $api_package           = false
     $api_service           = 'dcorch-api'
-    $snmp_package          = false
-    $snmp_service          = 'dcorch-snmp'
     $engine_package        = false
     $engine_service        = 'dcorch-engine'
     $api_proxy_package      = false

modules/puppet-dcorch/src/dcorch/manifests/snmp.pp

@@ -1,47 +0,0 @@
-#
-# Files in this package are licensed under Apache; see LICENSE file.
-#
-# Copyright (c) 2013-2018 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-#  Dec 2017 Creation based off puppet-sysinv
-#
-
-class dcorch::snmp (
-  $package_ensure   = 'latest',
-  $enabled          = false,
-  $bind_host        = '0.0.0.0',
-  $com_str          = 'dcorchAlarmAggregator'
-) {
-
-  include dcorch::params
-  include dcorch::deps
-
-  if $::dcorch::params::snmp_package {
-    package { 'dcorch-snmp':
-      ensure => $package_ensure,
-      name   => $::dcorch::params::snmp_package,
-      tag    => 'dcorch-package',
-    }
-  }
-  dcorch_config {
-    'snmp/snmp_ip':             value => $bind_host;
-    'snmp/snmp_comm_str':       value => $com_str;
-  }
-
-  if $enabled {
-    $ensure = 'running'
-  } else {
-    $ensure = 'stopped'
-  }
-
-  service { 'dcorch-snmp':
-    ensure    => $ensure,
-    name      => $::dcorch::params::snmp_service,
-    enable    => $enabled,
-    hasstatus => false,
-    tag       => 'dcorch-service',
-  }
-
-}

puppet-manifests/src/manifests/controller.pp

@@ -89,8 +89,6 @@ include ::platform::dcorch::engine
 include ::platform::dcorch::api_proxy
 include ::platform::dcmanager::api
 
-include ::platform::dcorch::snmp
-
 include ::platform::dcdbsync
 include ::platform::dcdbsync::api
 

puppet-manifests/src/modules/platform/manifests/dcorch.pp

@@ -110,15 +110,6 @@ class platform::dcorch::engine
   }
 }
 
-class platform::dcorch::snmp
-  inherits ::platform::dcorch::params {
-  if $::platform::params::distributed_cloud_role =='systemcontroller' {
-    class { '::dcorch::snmp':
-      bind_host => $api_host,
-    }
-  }
-}
-
 
 class platform::dcorch::api_proxy
   inherits ::platform::dcorch::params {

puppet-manifests/src/modules/platform/manifests/sm.pp

@@ -833,12 +833,6 @@ class platform::sm
     -> exec { 'Provision DCOrch-Engine in SM (service dcorch-engine)':
       command => 'sm-provision service dcorch-engine',
     }
-    -> exec { 'Provision DCOrch-Snmp (service-group-member dcorch-snmp)':
-        command => 'sm-provision service-group-member distributed-cloud-services dcorch-snmp',
-    }
-    -> exec { 'Provision DCOrch-Snmp in SM (service dcorch-snmp)':
-      command => 'sm-provision service dcorch-snmp',
-    }
     -> exec { 'Provision DCOrch-Identity-Api-Proxy (service-group-member dcorch-identity-api-proxy)':
       command => 'sm-provision service-group-member distributed-cloud-services dcorch-identity-api-proxy',
     }
@@ -878,9 +872,6 @@ class platform::sm
     -> exec { 'Configure OpenStack - DCOrch-Engine':
       command => "sm-configure service_instance dcorch-engine dcorch-engine \"\"",
     }
-    -> exec { 'Configure OpenStack - DCOrch-Snmp':
-      command => "sm-configure service_instance dcorch-snmp dcorch-snmp \"\"",
-    }
     -> exec { 'Configure OpenStack - DCOrch-identity-api-proxy':
       command => "sm-configure service_instance dcorch-identity-api-proxy dcorch-identity-api-proxy \"\"",
     }