From 466274e28712d913528742be3293266743062a45 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Tue, 26 Jul 2016 08:03:28 +0100 Subject: Move per-role *SchedulerHints parameters into role templates To enable custom roles, move these into the role templates where they can be passed via parameter defaults. Because the Compute role uses an inconsistent NovaCompute naming, these parameters cannot be generated in overcloud.yaml, so moving them enables backwards compatibility to be maintained when we move to a fully jinja generated overcloud (e.g including the role ResourceGroup resources) Change-Id: I3f9b2275f2b1daeb8b83f09548a089dadcfe9eee Partially-Implements: blueprint custom-roles --- puppet/cinder-storage.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'puppet/cinder-storage.yaml') diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml index edd81b9d..995e19f7 100644 --- a/puppet/cinder-storage.yaml +++ b/puppet/cinder-storage.yaml @@ -81,7 +81,7 @@ parameters: Extra properties or metadata passed to Nova for the created nodes in the overcloud. It's accessible via the Nova metadata API. type: json - SchedulerHints: + BlockStorageSchedulerHints: type: json description: Optional scheduler hints to pass to nova default: {} @@ -120,7 +120,7 @@ resources: params: {get_param: HostnameMap} software_config_transport: {get_param: SoftwareConfigTransport} metadata: {get_param: ServerMetadata} - scheduler_hints: {get_param: SchedulerHints} + scheduler_hints: {get_param: BlockStorageSchedulerHints} # Combine the NodeAdminUserData and NodeUserData mime archives UserData: -- cgit 1.2.3-korg