From 3d9863b6a0f0e8d7522a3f07432295aaf15c9444 Mon Sep 17 00:00:00 2001 From: David J Peacock <david.j.peacock@gmail.com> Date: Fri, 14 Dec 2018 13:09:34 -0500 Subject: [PATCH] flatten snmp service configuration This change combines the previous puppet and docker files into a single file that performs the docker service installation and configuration. Depends-On: https://review.rdoproject.org/r/#/c/16994/ Change-Id: I35616168df73d8ae7790816b88d06d5bff9c151a Related-Blueprint: services-yaml-flattening --- .../snmp.yaml => deployment/snmp/snmp-baremetal-puppet.yaml | 0 overcloud-resource-registry-puppet.j2.yaml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename puppet/services/snmp.yaml => deployment/snmp/snmp-baremetal-puppet.yaml (100%) diff --git a/puppet/services/snmp.yaml b/deployment/snmp/snmp-baremetal-puppet.yaml similarity index 100% rename from puppet/services/snmp.yaml rename to deployment/snmp/snmp-baremetal-puppet.yaml diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 46022ef6e2..47bc79d860 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -214,7 +214,7 @@ resource_registry: OS::TripleO::Services::ExternalSwiftProxy: OS::Heat::None OS::TripleO::Services::SwiftStorage: docker/services/swift-storage.yaml OS::TripleO::Services::SwiftRingBuilder: docker/services/swift-ringbuilder.yaml - OS::TripleO::Services::Snmp: puppet/services/snmp.yaml + OS::TripleO::Services::Snmp: deployment/snmp/snmp-baremetal-puppet.yaml OS::TripleO::Services::Tacker: OS::Heat::None OS::TripleO::Services::Timezone: puppet/services/time/timezone.yaml OS::TripleO::Services::CeilometerAgentCentral: docker/services/ceilometer-agent-central.yaml