openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Move masq-nets, swift-external, and validations to deployment 

Change-Id: I4000381a48f21263935518aca38cedcb792094d9
Related-Blueprint: services-yaml-flattening
This commit is contained in:
Dan Prince 2019-04-24 14:00:24 -04:00 committed by Alex Schultz
parent 2e2750b72d
commit 3ae00015e4
6 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
puppet/services/masquerade-networks.yaml → deployment/masquerade-networks/masquerade-networks-baremetal-puppet.yaml
View File

0
puppet/services/external-swift-proxy.yaml → deployment/swift/external-swift-proxy-baremetal-puppet.yaml
View File

0
puppet/services/tripleo-validations.yaml → deployment/validations/tripleo-validations-baremetal-puppet.yaml
View File

2
environments/services/masquerade-networks.yaml
View File

@ -1,4 +1,4 @@
# A Heat environment file that can be used to configure masquerade networks # A Heat environment file that can be used to configure masquerade networks
resource_registry: resource_registry:
OS::TripleO::Services::MasqueradeNetworks: ../../puppet/services/masquerade-networks.yaml OS::TripleO::Services::MasqueradeNetworks: ../../deployment/masquerade-networks/masquerade-networks-baremetal-puppet.yaml

2
environments/swift-external.yaml
View File

@ -1,5 +1,5 @@
resource_registry: resource_registry:
OS::TripleO::Services::ExternalSwiftProxy: ../puppet/services/external-swift-proxy.yaml OS::TripleO::Services::ExternalSwiftProxy: ../deployment/swift/external-swift-proxy-baremetal-puppet.yaml
OS::TripleO::Services::SwiftProxy: OS::Heat::None OS::TripleO::Services::SwiftProxy: OS::Heat::None
OS::TripleO::Services::SwiftStorage: OS::Heat::None OS::TripleO::Services::SwiftStorage: OS::Heat::None
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None

2
environments/tripleo-validations.yaml
View File

@ -1,4 +1,4 @@
# A Heat environment file that enables TripleO Validations. # A Heat environment file that enables TripleO Validations.
resource_registry: resource_registry:
OS::TripleO::Services::TripleoValidations: ../puppet/services/tripleo-validations.yaml OS::TripleO::Services::TripleoValidations: ../deployment/validations/tripleo-validations-baremetal-puppet.yaml