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
This commit is contained in:
parent
8391468d16
commit
87ce5d4574
|
@ -46,6 +46,9 @@ resource_registry:
|
||||||
OS::TripleO::ServiceServerMetadataHook: OS::Heat::None
|
OS::TripleO::ServiceServerMetadataHook: OS::Heat::None
|
||||||
|
|
||||||
OS::TripleO::Server: OS::Nova::Server
|
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
|
# This creates the "heat-admin" user for all OS images by default
|
||||||
# To disable, replace with firstboot/userdata_default.yaml
|
# To disable, replace with firstboot/userdata_default.yaml
|
||||||
|
|
|
@ -126,7 +126,7 @@ parameters:
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
BlockStorage:
|
BlockStorage:
|
||||||
type: OS::TripleO::Server
|
type: OS::TripleO::BlockStorageServer
|
||||||
metadata:
|
metadata:
|
||||||
os-collect-config:
|
os-collect-config:
|
||||||
command: {get_param: ConfigCommand}
|
command: {get_param: ConfigCommand}
|
||||||
|
|
|
@ -132,7 +132,7 @@ parameters:
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
CephStorage:
|
CephStorage:
|
||||||
type: OS::TripleO::Server
|
type: OS::TripleO::CephStorageServer
|
||||||
metadata:
|
metadata:
|
||||||
os-collect-config:
|
os-collect-config:
|
||||||
command: {get_param: ConfigCommand}
|
command: {get_param: ConfigCommand}
|
||||||
|
|
|
@ -145,7 +145,7 @@ parameters:
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
NovaCompute:
|
NovaCompute:
|
||||||
type: OS::TripleO::Server
|
type: OS::TripleO::ComputeServer
|
||||||
metadata:
|
metadata:
|
||||||
os-collect-config:
|
os-collect-config:
|
||||||
command: {get_param: ConfigCommand}
|
command: {get_param: ConfigCommand}
|
||||||
|
|
|
@ -165,7 +165,7 @@ parameter_groups:
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
Controller:
|
Controller:
|
||||||
type: OS::TripleO::Server
|
type: OS::TripleO::ControllerServer
|
||||||
metadata:
|
metadata:
|
||||||
os-collect-config:
|
os-collect-config:
|
||||||
command: {get_param: ConfigCommand}
|
command: {get_param: ConfigCommand}
|
||||||
|
|
|
@ -127,7 +127,7 @@ parameters:
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
SwiftStorage:
|
SwiftStorage:
|
||||||
type: OS::Nova::Server
|
type: OS::Nova::ObjectStorageServer
|
||||||
metadata:
|
metadata:
|
||||||
os-collect-config:
|
os-collect-config:
|
||||||
command: {get_param: ConfigCommand}
|
command: {get_param: ConfigCommand}
|
||||||
|
|
|
@ -148,7 +148,7 @@ parameters:
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
{{role}}:
|
{{role}}:
|
||||||
type: OS::TripleO::Server
|
type: OS::TripleO::{{role.name}}Server
|
||||||
metadata:
|
metadata:
|
||||||
os-collect-config:
|
os-collect-config:
|
||||||
command: {get_param: ConfigCommand}
|
command: {get_param: ConfigCommand}
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- 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. See
|
||||||
|
https://blueprints.launchpad.net/tripleo/+spec/pluggable-server-type-per-role
|
Loading…
Reference in New Issue