diff --git a/puppet/services/masquerade-networks.yaml b/deployment/masquerade-networks/masquerade-networks-baremetal-puppet.yaml similarity index 100% rename from puppet/services/masquerade-networks.yaml rename to deployment/masquerade-networks/masquerade-networks-baremetal-puppet.yaml diff --git a/puppet/services/external-swift-proxy.yaml b/deployment/swift/external-swift-proxy-baremetal-puppet.yaml similarity index 100% rename from puppet/services/external-swift-proxy.yaml rename to deployment/swift/external-swift-proxy-baremetal-puppet.yaml diff --git a/puppet/services/tripleo-validations.yaml b/deployment/validations/tripleo-validations-baremetal-puppet.yaml similarity index 100% rename from puppet/services/tripleo-validations.yaml rename to deployment/validations/tripleo-validations-baremetal-puppet.yaml diff --git a/environments/services/masquerade-networks.yaml b/environments/services/masquerade-networks.yaml index 6ebd15b0bf..2f545c485f 100644 --- a/environments/services/masquerade-networks.yaml +++ b/environments/services/masquerade-networks.yaml @@ -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 diff --git a/environments/swift-external.yaml b/environments/swift-external.yaml index 0bf0d39efb..9e76cda8b2 100644 --- a/environments/swift-external.yaml +++ b/environments/swift-external.yaml @@ -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 diff --git a/environments/tripleo-validations.yaml b/environments/tripleo-validations.yaml index 13d698d704..d613c8bcab 100644 --- a/environments/tripleo-validations.yaml +++ b/environments/tripleo-validations.yaml @@ -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