Merge "Move per-role *SchedulerHints parameters into role templates"

6 files changed, 10 insertions, 35 deletions

diff --git a/overcloud.yaml b/overcloud.yaml
index 78065087..2db7d33d 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -145,10 +145,6 @@ parameters:
     type: string
     constraints:
       - custom_constraint: nova.flavor
-  ControllerSchedulerHints:
-    type: json
-    description: Optional scheduler hints to pass to nova
-    default: {}
   ExtraConfig:
     default: {}
     description: |
@@ -193,10 +189,6 @@ parameters:
     default: ''
     description: Libvirt VIF driver configuration for the network
     type: string
-  NovaComputeSchedulerHints:
-    type: json
-    description: Optional scheduler hints to pass to nova
-    default: {}
   NovaEnableRbdBackend:
     default: false
     description: Whether to enable or not the Rbd backend for Nova
@@ -354,10 +346,6 @@ parameters:
       BlockStorage specific configuration to inject into the cluster. Same
       structure as ExtraConfig.
     type: json
-  BlockStorageSchedulerHints:
-    type: json
-    description: Optional scheduler hints to pass to nova
-    default: {}
   BlockStorageServices:
     default:
       - OS::TripleO::Services::CinderVolume
@@ -389,10 +377,6 @@ parameters:
       ObjectStorage specific configuration to inject into the cluster. Same
       structure as ExtraConfig.
     type: json
-  ObjectStorageSchedulerHints:
-    type: json
-    description: Optional scheduler hints to pass to nova
-    default: {}
   ObjectStorageServices:
     default:
       - OS::TripleO::Services::Kernel
@@ -427,10 +411,6 @@ parameters:
       CephStorage specific configuration to inject into the cluster. Same
       structure as ExtraConfig.
     type: json
-  CephStorageSchedulerHints:
-    type: json
-    description: Optional scheduler hints to pass to nova
-    default: {}
   CephStorageServices:
     default:
       - OS::TripleO::Services::CephOSD
@@ -595,7 +575,6 @@ resources:
               params:
                 '%stackname%': {get_param: 'OS::stack_name'}
           NodeIndex: '%index%'
-          SchedulerHints: {get_param: ControllerSchedulerHints}
           ServiceConfigSettings: {get_attr: [ControllerServiceChain, role_data, config_settings]}
           ServiceNames: {get_attr: [ControllerServiceChain, role_data, service_names]}
 
@@ -657,7 +636,6 @@ resources:
                 '%stackname%': {get_param: 'OS::stack_name'}
           CloudDomain: {get_param: CloudDomain}
           ServerMetadata: {get_param: ServerMetadata}
-          SchedulerHints: {get_param: NovaComputeSchedulerHints}
           NodeIndex: '%index%'
           ServiceConfigSettings: {get_attr: [ComputeServiceChain, role_data, config_settings]}
           ServiceNames: {get_attr: [ComputeServiceChain, role_data, service_names]}
@@ -691,7 +669,6 @@ resources:
           BlockStorageExtraConfig: {get_param: BlockStorageExtraConfig}
           CloudDomain: {get_param: CloudDomain}
           ServerMetadata: {get_param: ServerMetadata}
-          SchedulerHints: {get_param: BlockStorageSchedulerHints}
           NodeIndex: '%index%'
           ServiceConfigSettings: {get_attr: [BlockStorageServiceChain, role_data, config_settings]}
           ServiceNames: {get_attr: [BlockStorageServiceChain, role_data, service_names]}
@@ -726,7 +703,6 @@ resources:
           ObjectStorageExtraConfig: {get_param: ObjectStorageExtraConfig}
           CloudDomain: {get_param: CloudDomain}
           ServerMetadata: {get_param: ServerMetadata}
-          SchedulerHints: {get_param: ObjectStorageSchedulerHints}
           NodeIndex: '%index%'
           ServiceConfigSettings: {get_attr: [ObjectStorageServiceChain, role_data, config_settings]}
           ServiceNames: {get_attr: [ObjectStorageServiceChain, role_data, service_names]}
@@ -760,7 +736,6 @@ resources:
           CephStorageExtraConfig: {get_param: CephStorageExtraConfig}
           CloudDomain: {get_param: CloudDomain}
           ServerMetadata: {get_param: ServerMetadata}
-          SchedulerHints: {get_param: CephStorageSchedulerHints}
           NodeIndex: '%index%'
           ServiceConfigSettings: {get_attr: [CephStorageServiceChain, role_data, config_settings]}
           ServiceNames: {get_attr: [CephStorageServiceChain, role_data, service_names]}
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index 77ca4dc6..93c4a65b 100644
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-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:
+  CephStorageSchedulerHints:
     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: CephStorageSchedulerHints}
 
   # Combine the NodeAdminUserData and NodeUserData mime archives
   UserData:
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:
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index 0e029162..f4cbbf31 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -205,7 +205,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:
+  NovaComputeSchedulerHints:
     type: json
     description: Optional scheduler hints to pass to nova
     default: {}
@@ -244,7 +244,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: NovaComputeSchedulerHints}
 
   # Combine the NodeAdminUserData and NodeUserData mime archives
   UserData:
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:
diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index 034592a7..00b81eb2 100644
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -86,7 +86,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:
+  ObjectStorageSchedulerHints:
     type: json
     description: Optional scheduler hints to pass to nova
     default: {}
@@ -125,7 +125,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: ObjectStorageSchedulerHints}
 
   # Combine the NodeAdminUserData and NodeUserData mime archives
   UserData: