Merge "Pluggable server type per Role"

This commit is contained in:
Jenkins 2017-04-20 09:26:59 +00:00 committed by Gerrit Code Review
commit ef82c3a010
8 changed files with 17 additions and 6 deletions

View File

@ -48,6 +48,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

View File

@ -126,7 +126,7 @@ parameters:
resources:
BlockStorage:
type: OS::TripleO::Server
type: OS::TripleO::BlockStorageServer
metadata:
os-collect-config:
command: {get_param: ConfigCommand}

View File

@ -132,7 +132,7 @@ parameters:
resources:
CephStorage:
type: OS::TripleO::Server
type: OS::TripleO::CephStorageServer
metadata:
os-collect-config:
command: {get_param: ConfigCommand}

View File

@ -145,7 +145,7 @@ parameters:
resources:
NovaCompute:
type: OS::TripleO::Server
type: OS::TripleO::ComputeServer
metadata:
os-collect-config:
command: {get_param: ConfigCommand}

View File

@ -165,7 +165,7 @@ parameter_groups:
resources:
Controller:
type: OS::TripleO::Server
type: OS::TripleO::ControllerServer
metadata:
os-collect-config:
command: {get_param: ConfigCommand}

View File

@ -127,7 +127,7 @@ parameters:
resources:
SwiftStorage:
type: OS::Nova::Server
type: OS::Nova::ObjectStorageServer
metadata:
os-collect-config:
command: {get_param: ConfigCommand}

View File

@ -148,7 +148,7 @@ parameters:
resources:
{{role}}:
type: OS::TripleO::Server
type: OS::TripleO::{{role.name}}Server
metadata:
os-collect-config:
command: {get_param: ConfigCommand}

View File

@ -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