Move the rest of static roles resource registry entries to j2
Moving the rest of the static based resource registry
entries to j2, this allows to extend the content of the
template to the roles_list.
Also moved the templates to correspond with the role name.
Partial-Bug: #1626976
Change-Id: I1cbe101eb4ce5a89cba5f2cc45cace43d3380f22
(cherry picked from commit b0d660702e
)
This commit is contained in:
parent
c372fecf58
commit
d636e3a19f
|
@ -1,17 +1,7 @@
|
|||
resource_registry:
|
||||
OS::TripleO::BlockStorage: puppet/cinder-storage.yaml
|
||||
OS::TripleO::Compute: puppet/compute.yaml
|
||||
|
||||
OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
|
||||
OS::TripleO::Controller: puppet/controller.yaml
|
||||
OS::TripleO::ObjectStorage: puppet/swift-storage.yaml
|
||||
OS::TripleO::CephStorage: puppet/ceph-storage.yaml
|
||||
# set to controller-config-pacemaker.yaml to enable pacemaker
|
||||
OS::TripleO::ControllerConfig: puppet/controller-config.yaml
|
||||
OS::TripleO::PostDeploySteps: puppet/post.yaml
|
||||
OS::TripleO::ComputeConfig: puppet/compute-config.yaml
|
||||
OS::TripleO::BlockStorageConfig: puppet/blockstorage-config.yaml
|
||||
OS::TripleO::ObjectStorageConfig: puppet/objectstorage-config.yaml
|
||||
OS::TripleO::CephStorageConfig: puppet/cephstorage-config.yaml
|
||||
OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml
|
||||
OS::TripleO::DefaultPasswords: default_passwords.yaml
|
||||
|
||||
|
@ -20,11 +10,11 @@ resource_registry:
|
|||
OS::TripleO::Tasks::PackageUpdate: extraconfig/tasks/yum_update.yaml
|
||||
|
||||
{% for role in roles %}
|
||||
OS::TripleO::{{role.name}}: puppet/{{role.name.lower()}}.yaml
|
||||
OS::TripleO::{{role.name}}Config: puppet/{{role.name.lower()}}-config.yaml
|
||||
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
|
||||
|
@ -32,8 +22,8 @@ resource_registry:
|
|||
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
|
||||
|
|
Loading…
Reference in New Issue