X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=overcloud-resource-registry-puppet.yaml;h=a71f24c0642ff328f0b101b39cb37eb5529576e4;hb=b05137d61ae3a0ab2abcf0e259446183d3f5ddd8;hp=23cdf2a979286a4cde66e44306d6158ff4c16384;hpb=2698bb457309108dbf5821fe3976a64509c692e5;p=apex-tripleo-heat-templates.git diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 23cdf2a9..a71f24c0 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -1,7 +1,21 @@ resource_registry: - OS::TripleO::BlockStorage: cinder-storage.yaml - OS::TripleO::Compute: compute-puppet.yaml + OS::TripleO::BlockStorage: puppet/cinder-storage-puppet.yaml + OS::TripleO::Compute: puppet/compute-puppet.yaml OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment - OS::TripleO::Controller: controller-puppet.yaml - OS::TripleO::ObjectStorage: swift-storage.yaml + OS::TripleO::Controller: puppet/controller-puppet.yaml + OS::TripleO::ObjectStorage: puppet/swift-storage-puppet.yaml OS::TripleO::Net::SoftwareConfig: net-config-bridge.yaml + OS::TripleO::CephStorage: puppet/ceph-storage-puppet.yaml + OS::TripleO::ControllerPostDeployment: puppet/controller-post-puppet.yaml + OS::TripleO::ComputePostDeployment: puppet/compute-post-puppet.yaml + OS::TripleO::ObjectStoragePostDeployment: puppet/swift-storage-post.yaml + OS::TripleO::BlockStoragePostDeployment: puppet/cinder-storage-post.yaml + OS::TripleO::CephStoragePostDeployment: puppet/ceph-storage-post-puppet.yaml + OS::TripleO::SwiftDevicesAndProxy::SoftwareConfig: puppet/swift-devices-and-proxy-config.yaml + OS::TripleO::CephClusterConfig::SoftwareConfig: puppet/ceph-cluster-config.yaml + OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml + OS::TripleO::BootstrapNode::SoftwareConfig: puppet/bootstrap-config.yaml + +# NOTE(dprince): requires a new release of python-heatclient +#default_parameters: + #EnablePackageInstall: false