From 87ce5d457489f1c89ef47add8b5c7d5be094cf9c Mon Sep 17 00:00:00 2001 From: James Slagle Date: Thu, 13 Apr 2017 15:38:02 -0400 Subject: Pluggable server type per Role The server resource type, OS::TripleO::Server can now be mapped per role instead of globally. This allows users to mix baremetal (OS::Nova::Server) and deployed-server (OS::Heat::DeployedServer) server resources in the same deployment. blueprint pluggable-server-type-per-role Change-Id: Ib9e9abe2ba5103db221f0b485c46704b1e260dbf --- overcloud-resource-registry-puppet.j2.yaml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'overcloud-resource-registry-puppet.j2.yaml') diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index b1780680..3f40ded1 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -46,6 +46,9 @@ resource_registry: OS::TripleO::ServiceServerMetadataHook: OS::Heat::None OS::TripleO::Server: OS::Nova::Server +{% for role in roles %} + OS::TripleO::{{role.name}}Server: OS::TripleO::Server +{% endfor %} # This creates the "heat-admin" user for all OS images by default # To disable, replace with firstboot/userdata_default.yaml -- cgit 1.2.3-korg