# pxe: 172.30.2.43
# ksn: 172.29.1.43
# neutron: 10.0.102.43
-#platform:
-# vcpu_pin_set: "4-21,26-43,48-65,72-87"
-# WARNING: HUGEPAGES APPEARS TO CAUSE ISSUES WITH UCP POSTGRES
-# kernel_params:
-# hugepagesz: '1G'
-# hugepages: 32
-# default_hugepagesz: '1G'
-# iommu: 'pt'
-# intel_iommu: 'on'
+platform:
+ vcpu_pin_set: "4-21,26-43,48-65,72-87"
+ kernel_params:
+ hugepagesz: '1G'
+ hugepages: 32
+ default_hugepagesz: '1G'
+ transparent_hugepage: 'never'
+ iommu: 'pt'
+ intel_iommu: 'on'
+ amd_iommu: 'on'
+# console: 'ttyS1,115200n8'
hardware:
vendor: DELL
generation: '10'
# pxe: 172.30.1.33
# ksn: 172.29.1.33
# neutron: 10.0.101.33
-#platform:
-# vcpu_pin_set: "4-21,26-43,48-65,72-87"
-# WARNING: HUGEPAGES APPEARS TO CAUSE ISSUES WITH UCP POSTGRES
-# kernel_params:
-# hugepagesz: '1G'
-# hugepages: 32
-# default_hugepagesz: '1G'
-# iommu: 'pt'
-# intel_iommu: 'on'
+platform:
+ vcpu_pin_set: "4-21,26-43,48-65,72-87"
+ kernel_params:
+ hugepagesz: '1G'
+ hugepages: 32
+ default_hugepagesz: '1G'
+ transparent_hugepage: 'never'
+ iommu: 'pt'
+ intel_iommu: 'on'
+ amd_iommu: 'on'
+# console: 'ttyS1,115200n8'
hardware:
vendor: HP
generation: '10'
platform:
kernel_params:
{% for key, value in yaml.platform.kernel_params.items() %}
- {{key}}: {{value}}
-{% endfor %}{% endif %}
+ {{key}}: '{{value}}'
+{% endfor %}
+{% if 'vcpu_pin_set' in yaml.platform %}
+ isolcpus: '{{yaml.platform.vcpu_pin_set}}'
+{% endif %}
+{% endif %}
{% endfor %}
{% if 'workers' in yaml %}{% for server in yaml.workers %}
---
platform:
kernel_params:
{% for key, value in yaml.platform.kernel_params.items() %}
- {{key}}: {{value}}
-{% endfor %}{% endif %}
+ {{key}}: '{{value}}'
+{% endfor %}
+{% if 'vcpu_pin_set' in yaml.platform %}
+ isolcpus: '{{yaml.platform.vcpu_pin_set}}'
+{% endif %}
+{% endif %}
{% endfor %}{% endif %}
...
image: 'xenial'
kernel: 'hwe-16.04'
kernel_params:
+{% if 'platform' in yaml and 'kernel_params' in yaml.platform %}
+{% for key, value in yaml.platform.kernel_params.items() %}
+ {{key}}: '{{value}}'
+{% endfor %}
+{% else %}
console: 'ttyS1,115200n8'
intel_iommu: 'on'
iommu: 'pt'
amd_iommu: 'on'
transparent_hugepage: 'never'
- hugepagesz: 'hardwareprofile:hugepages.dpdk.size'
- hugepages: 'hardwareprofile:hugepages.dpdk.count'
- default_hugepagesz: 'hardwareprofile:hugepages.dpdk.size'
- isolcpus: 'hardwareprofile:cpuset.kvm'
+{% endif %}
+{% if 'platform' in yaml and 'vcpu_pin_set' in yaml.platform %}
+ isolcpus: '{{yaml.platform.vcpu_pin_set}}'
+{% endif %}
metadata:
owner_data:
openstack-nova-compute: enabled
image: 'xenial'
kernel: 'hwe-16.04'
kernel_params:
+{% if 'platform' in yaml and 'kernel_params' in yaml.platform %}
+{% for key, value in yaml.platform.kernel_params.items() %}
+ {{key}}: '{{value}}'
+{% endfor %}
+{% else %}
console: 'ttyS1,115200n8'
intel_iommu: 'on'
iommu: 'pt'
amd_iommu: 'on'
transparent_hugepage: 'never'
- hugepagesz: 'hardwareprofile:hugepages.dpdk.size'
- hugepages: 'hardwareprofile:hugepages.dpdk.count'
- default_hugepagesz: 'hardwareprofile:hugepages.dpdk.size'
- isolcpus: 'hardwareprofile:cpuset.kvm'
+{% endif %}
+{% if 'platform' in yaml and 'vcpu_pin_set' in yaml.platform %}
+ isolcpus: '{{yaml.platform.vcpu_pin_set}}'
+{% endif %}
metadata:
owner_data:
control-plane: enabled
platform:
kernel_params:
{% for key, value in yaml.platform.kernel_params.items() %}
- {{key}}: {{value}}
-{% endfor %}{% endif %}
+ {{key}}: '{{value}}'
+{% endfor %}
+{% if 'vcpu_pin_set' in yaml.platform %}
+ isolcpus: '{{yaml.platform.vcpu_pin_set}}'
+{% endif %}
+{% endif %}
{% endfor %}
{% if 'workers' in yaml %}{% for server in yaml.workers %}
---
platform:
kernel_params:
{% for key, value in yaml.platform.kernel_params.items() %}
- {{key}}: {{value}}
-{% endfor %}{% endif %}
+ {{key}}: '{{value}}'
+{% endfor %}
+{% if 'vcpu_pin_set' in yaml.platform %}
+ isolcpus: '{{yaml.platform.vcpu_pin_set}}'
+{% endif %}
+{% endif %}
{% endfor %}{% endif %}
...
image: 'xenial'
kernel: 'hwe-16.04'
kernel_params:
+{% if 'platform' in yaml and 'kernel_params' in yaml.platform %}
+{% for key, value in yaml.platform.kernel_params.items() %}
+ {{key}}: '{{value}}'
+{% endfor %}
+{% else %}
console: 'ttyS1,115200n8'
intel_iommu: 'on'
iommu: 'pt'
amd_iommu: 'on'
transparent_hugepage: 'never'
- hugepagesz: 'hardwareprofile:hugepages.dpdk.size'
- hugepages: 'hardwareprofile:hugepages.dpdk.count'
- default_hugepagesz: 'hardwareprofile:hugepages.dpdk.size'
- isolcpus: 'hardwareprofile:cpuset.kvm'
+{% endif %}
+{% if 'platform' in yaml and 'vcpu_pin_set' in yaml.platform %}
+ isolcpus: '{{yaml.platform.vcpu_pin_set}}'
+{% endif %}
metadata:
owner_data:
openstack-nova-compute: enabled
image: 'xenial'
kernel: 'hwe-16.04'
kernel_params:
+{% if 'platform' in yaml and 'kernel_params' in yaml.platform %}
+{% for key, value in yaml.platform.kernel_params.items() %}
+ {{key}}: '{{value}}'
+{% endfor %}
+{% else %}
console: 'ttyS1,115200n8'
intel_iommu: 'on'
iommu: 'pt'
amd_iommu: 'on'
transparent_hugepage: 'never'
- hugepagesz: 'hardwareprofile:hugepages.dpdk.size'
- hugepages: 'hardwareprofile:hugepages.dpdk.count'
- default_hugepagesz: 'hardwareprofile:hugepages.dpdk.size'
- isolcpus: 'hardwareprofile:cpuset.kvm'
+{% endif %}
+{% if 'platform' in yaml and 'vcpu_pin_set' in yaml.platform %}
+ isolcpus: '{{yaml.platform.vcpu_pin_set}}'
+{% endif %}
metadata:
owner_data:
control-plane: enabled