Revert "puppet: disable swift proxy and glance backend"

[apex-tripleo-heat-templates.git] / overcloud-resource-registry-puppet.yaml

diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index 30afa81..ab6be35 100644 (file)
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -1,8 +1,14 @@
 resource_registry:
-  OS::TripleO::BlockStorage: cinder-storage.yaml
-  OS::TripleO::Compute: compute.yaml
-  OS::TripleO::Compute::SoftwareConfig: compute-config-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.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::SwiftDevicesAndProxy::SoftwareConfig: puppet/swift-devices-and-proxy-config.yaml
+
+# NOTE(dprince): requires a new release of python-heatclient
+#default_parameters:
+  #EnablePackageInstall: false