From f24b2f5054156016284fb520022d259906fb3ef5 Mon Sep 17 00:00:00 2001 From: Gerry Kopec Date: Mon, 30 Mar 2020 00:37:38 -0400 Subject: [PATCH] Remove dcorch-snmp dcorch-snmp process/service is being removed from distributed cloud. Remove associated puppet config. Change-Id: I5691648887e2302eeda0b5e853a72df52ae0ba72 Story: 2007267 Task: 39190 Depends-On: https://review.opendev.org/#/c/715765 Signed-off-by: Gerry Kopec --- .../src/dcorch/manifests/params.pp | 6 --- .../src/dcorch/manifests/snmp.pp | 47 ------------------- puppet-manifests/src/manifests/controller.pp | 2 - .../src/modules/platform/manifests/dcorch.pp | 9 ---- .../src/modules/platform/manifests/sm.pp | 9 ---- 5 files changed, 73 deletions(-) delete mode 100644 modules/puppet-dcorch/src/dcorch/manifests/snmp.pp diff --git a/modules/puppet-dcorch/src/dcorch/manifests/params.pp b/modules/puppet-dcorch/src/dcorch/manifests/params.pp index 76d5fa1f7..df823dc51 100644 --- a/modules/puppet-dcorch/src/dcorch/manifests/params.pp +++ b/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 diff --git a/modules/puppet-dcorch/src/dcorch/manifests/snmp.pp b/modules/puppet-dcorch/src/dcorch/manifests/snmp.pp deleted file mode 100644 index f82a57c06..000000000 --- a/modules/puppet-dcorch/src/dcorch/manifests/snmp.pp +++ /dev/null @@ -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', - } - -} diff --git a/puppet-manifests/src/manifests/controller.pp b/puppet-manifests/src/manifests/controller.pp index eeba6f8cb..e247c828a 100644 --- a/puppet-manifests/src/manifests/controller.pp +++ b/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 diff --git a/puppet-manifests/src/modules/platform/manifests/dcorch.pp b/puppet-manifests/src/modules/platform/manifests/dcorch.pp index d899ff186..9e4080cb7 100644 --- a/puppet-manifests/src/modules/platform/manifests/dcorch.pp +++ b/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 { diff --git a/puppet-manifests/src/modules/platform/manifests/sm.pp b/puppet-manifests/src/modules/platform/manifests/sm.pp index 6079a7650..e8871c304 100644 --- a/puppet-manifests/src/modules/platform/manifests/sm.pp +++ b/puppet-manifests/src/modules/platform/manifests/sm.pp @@ -817,12 +817,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', } @@ -862,9 +856,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 \"\"", }