summaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-26 18:40:01 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-26 19:14:37 +0100
commita2062e5fd64a2737df44497bfcece7e804b7f5bf (patch)
treea8e904fbe8658ad23e37006fba8784a5f636927c /mcp/reclass
parent672ae12f6a4ef316230e6187692ec647786add9c (diff)
[patch] cleanup: Drop LVM filter disable
Now we explicitly add a LVM PV on /dev/sda{1,2} for Cinder storage, so we can safely drop the patch disabling LVM volume filtering. If we later move the PV to a different disk, we can just add the VG and LV definitions to linux:storage via reclass, and Salt will skip setting them up (as they're already created by MaaS), yet keep the filtering sane. While at it, fix 'nova_cpu_pinning' param expr; constructs based on reclass interpolation (e.g. '${_param:x}') do not work when parameters are passed via reclass.storage templating, so change reclass interpolation syntax with classic YAML anchors. Fixes: 672ae12 Change-Id: Ieb41635ddeb630543d7e4d1079f45d636d9a43af Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
index 677f0c9a0..477c0957b 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
@@ -25,11 +25,11 @@ parameters:
dummy_value: ~
{%- endif %}
{%- else %}
- nova_cpu_pinning: '"1,2,3,4,5,7,8,9,10,11"'
+ nova_cpu_pinning: &nova_cpu_pinning_common '"1,2,3,4,5,7,8,9,10,11"'
compute_hugepages_size: 1G
compute_hugepages_count: 16
compute_hugepages_mount: /mnt/hugepages_1G
- compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
+ compute_kernel_isolcpu: *nova_cpu_pinning_common
{%- endif %}
openstack_compute_node02:
<<: *openstack_compute_node01