diff options
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/ceph-storage.yaml | 6 | ||||
| -rw-r--r-- | puppet/cinder-storage.yaml | 5 | ||||
| -rw-r--r-- | puppet/compute.yaml | 6 | ||||
| -rw-r--r-- | puppet/controller.yaml | 5 | ||||
| -rw-r--r-- | puppet/swift-storage.yaml | 6 |
5 files changed, 25 insertions, 3 deletions
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml index b34d2c02..adbf4bc5 100644 --- a/puppet/ceph-storage.yaml +++ b/puppet/ceph-storage.yaml @@ -71,7 +71,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: CephStorage: @@ -87,6 +90,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: diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml index 82c0e814..1c05b387 100644 --- a/puppet/cinder-storage.yaml +++ b/puppet/cinder-storage.yaml @@ -124,6 +124,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: @@ -140,6 +144,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: diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 42c6e276..5e38d1c1 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -296,13 +296,16 @@ parameters: description: > The DNS domain used for the hosts. This should match the dhcp_domain configured in the Undercloud neutron. Defaults to localdomain. - ServerMetadata: default: {} description: > 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: @@ -321,6 +324,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: 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: diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml index a8183f76..840cf540 100644 --- a/puppet/swift-storage.yaml +++ b/puppet/swift-storage.yaml @@ -94,7 +94,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: @@ -110,6 +113,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: |