diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-07-26 08:03:28 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2016-07-27 17:04:59 +0100 |
| commit | 466274e28712d913528742be3293266743062a45 (patch) | |
| tree | 46d99b6891783f3ded53a7978333075f2032c88f /puppet/cinder-storage.yaml | |
| parent | 918b668bf4fe4a32cce9440bc123b663acc7c5a9 (diff) | |
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
Diffstat (limited to 'puppet/cinder-storage.yaml')
| -rw-r--r-- | puppet/cinder-storage.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
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: |