summaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-14 15:20:41 +0000
committerGerrit Code Review <review@openstack.org>2015-12-14 15:20:41 +0000
commit64c2ca04a14ef8e31a861fa394422731d9ca897f (patch)
treea05e9c34b2898489bde5bb5fd3d50d2f5599bd04 /puppet/controller.yaml
parent7f8bbdd020bfc7eb3fdf87228dcde8dcf836faf7 (diff)
parent5d61012f86a2e036908a2f7441672e43cbd34790 (diff)
Merge "Enable per-role SchedulerHints"
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r--puppet/controller.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 97b5456b..fc257069 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -644,6 +644,10 @@ 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:
+ type: json
+ description: Optional scheduler hints to pass to nova
+ default: {}
resources:
@@ -660,6 +664,7 @@ resources:
user_data: {get_resource: UserData}
name: {get_param: Hostname}
metadata: {get_param: ServerMetadata}
+ scheduler_hints: {get_param: SchedulerHints}
# Combine the NodeAdminUserData and NodeUserData mime archives
UserData: