j2 template per-role things in default registry
The default resource-registry file contains a bunch of per-role things which mean you need to cut/paste into a custom environment file for custom roles, even if you only want the defaults like the built-in roles. Using j2 we can template these just like in the overcloud.j2.yaml and other files. Change-Id: I52a9bffd043ca8fb0f05077c8a401a68def82926 Partial-Bug: #1626976
This commit is contained in:
Steven Hardy
Carlos Camacho
parent
da53e9c00b
commit
7e9fd59f54
|
|
@ -1,15 +1,10 @@
|
|||
resource_registry:
|
||||
OS::TripleO::BlockStorage: puppet/cinder-storage.yaml
|
||||
OS::TripleO::BlockStorage::Net::SoftwareConfig: net-config-noop.yaml
|
||||
OS::TripleO::Compute: puppet/compute.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: net-config-noop.yaml
|
||||
OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
|
||||
OS::TripleO::Controller: puppet/controller.yaml
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: net-config-bridge.yaml
|
||||
OS::TripleO::ObjectStorage: puppet/swift-storage.yaml
|
||||
OS::TripleO::ObjectStorage::Net::SoftwareConfig: net-config-noop.yaml
|
||||
OS::TripleO::CephStorage: puppet/ceph-storage.yaml
|
||||
OS::TripleO::CephStorage::Net::SoftwareConfig: net-config-noop.yaml
|
||||
# set to controller-config-pacemaker.yaml to enable pacemaker
|
||||
OS::TripleO::ControllerConfig: puppet/controller-config.yaml
|
||||
OS::TripleO::PostDeploySteps: puppet/post.yaml
|
||||
|
|
@ -23,17 +18,27 @@ resource_registry:
|
|||
# Tasks (for internal TripleO usage)
|
||||
OS::TripleO::Tasks::UpdateWorkflow: OS::Heat::None
|
||||
OS::TripleO::Tasks::PackageUpdate: extraconfig/tasks/yum_update.yaml
|
||||
OS::TripleO::Tasks::ControllerPreConfig: OS::Heat::None
|
||||
OS::TripleO::Tasks::ControllerPostConfig: OS::Heat::None
|
||||
OS::TripleO::Tasks::ComputePreConfig: OS::Heat::None
|
||||
OS::TripleO::Tasks::ComputePostConfig: OS::Heat::None
|
||||
OS::TripleO::Tasks::BlockStoragePreConfig: OS::Heat::None
|
||||
OS::TripleO::Tasks::BlockStoragePostConfig: OS::Heat::None
|
||||
OS::TripleO::Tasks::ObjectStoragePreConfig: OS::Heat::None
|
||||
OS::TripleO::Tasks::ObjectStoragePostConfig: OS::Heat::None
|
||||
OS::TripleO::Tasks::CephStoragePreConfig: OS::Heat::None
|
||||
OS::TripleO::Tasks::CephStoragePostConfig: OS::Heat::None
|
||||
|
||||
{% for role in roles %}
|
||||
OS::TripleO::Tasks::{{role.name}}PreConfig: OS::Heat::None
|
||||
OS::TripleO::Tasks::{{role.name}}PostConfig: OS::Heat::None
|
||||
|
||||
OS::TripleO::{{role.name}}ExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
|
||||
|
||||
# Port assignments for the {{role.name}} role
|
||||
OS::TripleO::{{role.name}}::Ports::ExternalPort: network/ports/noop.yaml
|
||||
OS::TripleO::{{role.name}}::Ports::InternalApiPort: network/ports/noop.yaml
|
||||
OS::TripleO::{{role.name}}::Ports::StoragePort: network/ports/noop.yaml
|
||||
OS::TripleO::{{role.name}}::Ports::StorageMgmtPort: network/ports/noop.yaml
|
||||
OS::TripleO::{{role.name}}::Ports::TenantPort: network/ports/noop.yaml
|
||||
OS::TripleO::{{role.name}}::Ports::ManagementPort: network/ports/noop.yaml
|
||||
|
||||
OS::TripleO::{{role.name}}::Net::SoftwareConfig: net-config-noop.yaml
|
||||
{% endfor %}
|
||||
|
||||
# This resource registry entry will override the one generated by default
|
||||
# in the jinja loop
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: net-config-bridge.yaml
|
||||
|
||||
OS::TripleO::Server: OS::Nova::Server
|
||||
|
||||
|
|
@ -49,9 +54,6 @@ resource_registry:
|
|||
OS::TripleO::NodeUserData: firstboot/userdata_default.yaml
|
||||
OS::TripleO::NodeTLSCAData: OS::Heat::None
|
||||
OS::TripleO::NodeTLSData: OS::Heat::None
|
||||
OS::TripleO::ControllerExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
|
||||
OS::TripleO::ComputeExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
|
||||
OS::TripleO::CephStorageExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
|
||||
OS::TripleO::NodeExtraConfig: puppet/extraconfig/pre_deploy/default.yaml
|
||||
OS::TripleO::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml
|
||||
|
||||
|
|
@ -85,46 +87,6 @@ resource_registry:
|
|||
OS::TripleO::Network::Ports::StorageMgmtVipPort: network/ports/noop.yaml
|
||||
OS::TripleO::Network::Ports::RedisVipPort: network/ports/ctlplane_vip.yaml
|
||||
|
||||
# Port assignments for the controller role
|
||||
OS::TripleO::Controller::Ports::ExternalPort: network/ports/noop.yaml
|
||||
OS::TripleO::Controller::Ports::InternalApiPort: network/ports/noop.yaml
|
||||
OS::TripleO::Controller::Ports::StoragePort: network/ports/noop.yaml
|
||||
OS::TripleO::Controller::Ports::StorageMgmtPort: network/ports/noop.yaml
|
||||
OS::TripleO::Controller::Ports::TenantPort: network/ports/noop.yaml
|
||||
OS::TripleO::Controller::Ports::ManagementPort: network/ports/noop.yaml
|
||||
|
||||
# Port assignments for the compute role
|
||||
OS::TripleO::Compute::Ports::ExternalPort: network/ports/noop.yaml
|
||||
OS::TripleO::Compute::Ports::InternalApiPort: network/ports/noop.yaml
|
||||
OS::TripleO::Compute::Ports::StoragePort: network/ports/noop.yaml
|
||||
OS::TripleO::Compute::Ports::StorageMgmtPort: network/ports/noop.yaml
|
||||
OS::TripleO::Compute::Ports::TenantPort: network/ports/noop.yaml
|
||||
OS::TripleO::Compute::Ports::ManagementPort: network/ports/noop.yaml
|
||||
|
||||
# Port assignments for the ceph storage role
|
||||
OS::TripleO::CephStorage::Ports::ExternalPort: network/ports/noop.yaml
|
||||
OS::TripleO::CephStorage::Ports::InternalApiPort: network/ports/noop.yaml
|
||||
OS::TripleO::CephStorage::Ports::StoragePort: network/ports/noop.yaml
|
||||
OS::TripleO::CephStorage::Ports::StorageMgmtPort: network/ports/noop.yaml
|
||||
OS::TripleO::CephStorage::Ports::TenantPort: network/ports/noop.yaml
|
||||
OS::TripleO::CephStorage::Ports::ManagementPort: network/ports/noop.yaml
|
||||
|
||||
# Port assignments for the swift storage role
|
||||
OS::TripleO::SwiftStorage::Ports::ExternalPort: network/ports/noop.yaml
|
||||
OS::TripleO::SwiftStorage::Ports::InternalApiPort: network/ports/noop.yaml
|
||||
OS::TripleO::SwiftStorage::Ports::StoragePort: network/ports/noop.yaml
|
||||
OS::TripleO::SwiftStorage::Ports::StorageMgmtPort: network/ports/noop.yaml
|
||||
OS::TripleO::SwiftStorage::Ports::TenantPort: network/ports/noop.yaml
|
||||
OS::TripleO::SwiftStorage::Ports::ManagementPort: network/ports/noop.yaml
|
||||
|
||||
# Port assignments for the block storage role
|
||||
OS::TripleO::BlockStorage::Ports::ExternalPort: network/ports/noop.yaml
|
||||
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
|
||||
OS::TripleO::BlockStorage::Ports::TenantPort: network/ports/noop.yaml
|
||||
OS::TripleO::BlockStorage::Ports::ManagementPort: network/ports/noop.yaml
|
||||
|
||||
# Service to network Mappings
|
||||
OS::TripleO::ServiceNetMap: network/service_net_map.yaml
|
||||
|
||||
Loading…
Reference in New Issue