From bcc3335424ec4a4c1a611623f0c2286a0151897d Mon Sep 17 00:00:00 2001 From: David J Peacock Date: Fri, 14 Dec 2018 13:16:34 -0500 Subject: [PATCH] flatten tripleo-firewall 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: I9556a07d72fabfbd5f6f35eaf3d7a1bd88ef7470 Related-Blueprint: services-yaml-flattening --- .../tripleo-firewall/tripleo-firewall-baremetal-puppet.yaml | 0 overcloud-resource-registry-puppet.j2.yaml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename puppet/services/tripleo-firewall.yaml => deployment/tripleo-firewall/tripleo-firewall-baremetal-puppet.yaml (100%) diff --git a/puppet/services/tripleo-firewall.yaml b/deployment/tripleo-firewall/tripleo-firewall-baremetal-puppet.yaml similarity index 100% rename from puppet/services/tripleo-firewall.yaml rename to deployment/tripleo-firewall/tripleo-firewall-baremetal-puppet.yaml diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 46022ef6e2..b7cd5f07ed 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -278,7 +278,7 @@ resource_registry: OS::TripleO::Services::IronicNeutronAgent: OS::Heat::None OS::TripleO::Services::NovaIronic: OS::Heat::None OS::TripleO::Services::TripleoPackages: puppet/services/tripleo-packages.yaml - OS::TripleO::Services::TripleoFirewall: puppet/services/tripleo-firewall.yaml + OS::TripleO::Services::TripleoFirewall: deployment/tripleo-firewall/tripleo-firewall-baremetal-puppet.yaml OS::TripleO::Services::OpenStackClients: OS::Heat::None OS::TripleO::Services::OpenDaylightApi: OS::Heat::None OS::TripleO::Services::OpenDaylightOvs: OS::Heat::None