Merge "Pass ceph::pool arguments when calling class"

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

diff --git a/overcloud-resource-registry.yaml b/overcloud-resource-registry.yaml
index 3d92082..ed02551 100644 (file)
--- a/overcloud-resource-registry.yaml
+++ b/overcloud-resource-registry.yaml
@@ -1,30 +1,37 @@
 resource_registry:
-  OS::TripleO::BlockStorage: cinder-storage.yaml
+  OS::TripleO::BlockStorage: os-apply-config/cinder-storage.yaml
   OS::TripleO::BlockStorage::Net::SoftwareConfig: net-config-noop.yaml
-  OS::TripleO::Compute: compute.yaml
+  OS::TripleO::Compute: os-apply-config/compute.yaml
   OS::TripleO::Compute::Net::SoftwareConfig: net-config-noop.yaml
   OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
-  OS::TripleO::Controller: controller.yaml
+  OS::TripleO::Controller: os-apply-config/controller.yaml
   OS::TripleO::Controller::Net::SoftwareConfig: net-config-noop.yaml
-  OS::TripleO::ObjectStorage: swift-storage.yaml
+  OS::TripleO::ObjectStorage: os-apply-config/swift-storage.yaml
   OS::TripleO::ObjectStorage::Net::SoftwareConfig: net-config-noop.yaml
-  OS::TripleO::CephStorage: ceph-storage.yaml
+  OS::TripleO::CephStorage: os-apply-config/ceph-storage.yaml
   OS::TripleO::CephStorage::Net::SoftwareConfig: net-config-noop.yaml
-  OS::TripleO::ControllerPostDeployment: controller-post.yaml
-  OS::TripleO::ComputePostDeployment: compute-post.yaml
-  OS::TripleO::ObjectStoragePostDeployment: swift-storage-post.yaml
-  OS::TripleO::BlockStoragePostDeployment: cinder-storage-post.yaml
-  OS::TripleO::CephStoragePostDeployment: ceph-storage-post.yaml
-  OS::TripleO::SwiftDevicesAndProxy::SoftwareConfig: swift-devices-and-proxy-config.yaml
-  OS::TripleO::CephClusterConfig::SoftwareConfig: ceph-cluster-config.yaml
-  OS::TripleO::AllNodes::SoftwareConfig: all-nodes-config.yaml
+  OS::TripleO::ControllerPostDeployment: os-apply-config/controller-post.yaml
+  OS::TripleO::ComputePostDeployment: os-apply-config/compute-post.yaml
+  OS::TripleO::ObjectStoragePostDeployment: os-apply-config/swift-storage-post.yaml
+  OS::TripleO::BlockStoragePostDeployment: os-apply-config/cinder-storage-post.yaml
+  OS::TripleO::CephStoragePostDeployment: os-apply-config/ceph-storage-post.yaml
+  OS::TripleO::SwiftDevicesAndProxy::SoftwareConfig: os-apply-config/swift-devices-and-proxy-config.yaml
+  OS::TripleO::CephClusterConfig::SoftwareConfig: os-apply-config/ceph-cluster-config.yaml
+  OS::TripleO::AllNodes::SoftwareConfig: os-apply-config/all-nodes-config.yaml
   OS::TripleO::BootstrapNode::SoftwareConfig: bootstrap-config.yaml
   OS::TripleO::NodeUserData: firstboot/userdata_default.yaml
   OS::TripleO::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml
+  OS::TripleO::Tasks::PackageUpdate: extraconfig/tasks/yum_update.yaml
+
+  # "AllNodes" Extra cluster config, runs on all nodes prior to the post_deploy
+  # phase, e.g when puppet is applied, but after the pre_deploy phase.  Useful when
+  # configuration with knowledge of all nodes in the cluster is required vs single
+  # node configuration in the pre_deploy step.
+  OS::TripleO::AllNodesExtraConfig: extraconfig/all_nodes/default.yaml
 
   # TripleO overcloud networks
   OS::TripleO::Network: network/networks.yaml
-  OS::TripleO::VipConfig: vip-config.yaml
+  OS::TripleO::VipConfig: os-apply-config/vip-config.yaml
 
   OS::TripleO::Network::External: network/noop.yaml
   OS::TripleO::Network::InternalApi: network/noop.yaml
@@ -33,6 +40,7 @@ resource_registry:
   OS::TripleO::Network::Tenant: network/noop.yaml
 
   OS::TripleO::Network::Ports::NetIpMap: network/ports/net_ip_map.yaml
+  OS::TripleO::Network::Ports::NetIpSubnetMap: network/ports/net_ip_subnet_map.yaml
   OS::TripleO::Network::Ports::NetIpListMap: network/ports/net_ip_list_map.yaml
 
   # Port assignments for the controller role
@@ -60,3 +68,13 @@ resource_registry:
   OS::TripleO::BlockStorage::Ports::InternalApiPort: network/ports/noop.yaml
   OS::TripleO::BlockStorage::Ports::StoragePort: network/ports/noop.yaml
   OS::TripleO::BlockStorage::Ports::StorageMgmtPort: network/ports/noop.yaml
+
+  # Port assignments for service virtual IPs for the controller role
+  OS::TripleO::Controller::Ports::RedisVipPort: network/ports/noop.yaml
+
+  # Service Endpoint Mappings
+  OS::TripleO::Endpoint: network/endpoints/endpoint.yaml
+  OS::TripleO::EndpointMap: network/endpoints/endpoint_map.yaml
+
+  # validation resources
+  OS::TripleO::AllNodes::Validation: os-apply-config/all-nodes-validation.yaml