diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-05 04:51:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-05 04:51:08 +0000 |
| commit | a45ea6107df25f1444142a1945717c90180e2700 (patch) | |
| tree | e6071f92f887a30bc118914508580adbecf750b0 /puppet/controller.yaml | |
| parent | 850c650161adaac894692df7605eda2486d882cc (diff) | |
| parent | 466274e28712d913528742be3293266743062a45 (diff) | |
Merge "Move per-role *SchedulerHints parameters into role templates"
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index b604ffca..8013ecf4 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -311,7 +311,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: + ControllerSchedulerHints: type: json description: Optional scheduler hints to pass to nova default: {} @@ -354,7 +354,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: ControllerSchedulerHints} # Combine the NodeAdminUserData and NodeUserData mime archives UserData: |