Browse Source

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

Change-Id: I4000381a48f21263935518aca38cedcb792094d9
Related-Blueprint: services-yaml-flattening
changes/12/655512/4
Dan Prince 2 years ago
committed by Alex Schultz
parent
commit
3ae00015e4
6 changed files with 3 additions and 3 deletions
  1. +0
    -0
      deployment/masquerade-networks/masquerade-networks-baremetal-puppet.yaml
  2. +0
    -0
      deployment/swift/external-swift-proxy-baremetal-puppet.yaml
  3. +0
    -0
      deployment/validations/tripleo-validations-baremetal-puppet.yaml
  4. +1
    -1
      environments/services/masquerade-networks.yaml
  5. +1
    -1
      environments/swift-external.yaml
  6. +1
    -1
      environments/tripleo-validations.yaml

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


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


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


+ 1
- 1
environments/services/masquerade-networks.yaml View File

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

+ 1
- 1
environments/swift-external.yaml View File

@ -1,5 +1,5 @@
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::SwiftStorage: OS::Heat::None
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None


+ 1
- 1
environments/tripleo-validations.yaml View File

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

Loading…
Cancel
Save