summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-22 02:02:45 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-22 02:19:06 +0100
commita854b61568c2f615672f17868e2cfe31d97c751f (patch)
tree461ea807c76a499084551cdc49e4fe463e845331
parentf6f8a56b40c5268d94cdb8e9aef6ea937f68a18e (diff)
[HA] [cinder] Fix rootfs part name for sda > 2TB
On systems with more than 2TB on /dev/sda, MaaS automatically creates a 1MB partition with bios_grub label as /dev/sda1. Account for this and expect rootfs to reside on /dev/sda2 (assume all compute nodes have the same behavior wrt this issue). Ideally, later we will switch to explicit partitioning via MaaS, or to a new baremetal provisioner like Ironic. Requires bumping Pharos git submodule to pick up the new j2 filter. Fixes: f6f8a56 JIRA: FUEL-330 Change-Id: I12f5046cf69bf2f52c8b8dc331b90048df643646 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j23
m---------mcp/scripts/pharos0
2 files changed, 2 insertions, 1 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2
index a14796178..ca9bcb1a9 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2
@@ -14,7 +14,8 @@
parameters:
_param:
# Should later be determined via PDF/IDF, AArch64 has ESP on /dev/sda1
-{%- if conf.nodes[nm.cmp001.idx].node.arch == 'aarch64' %}
+{%- if conf.nodes[nm.cmp001.idx].node.arch == 'aarch64' or
+ conf.nodes[nm.cmp001.idx].disks.0.disk_capacity | storage_size_num | float > 2000000000000 %}
~cinder_lvm_devices: [ '/dev/sda2' ]
{%- else %}
~cinder_lvm_devices: [ '/dev/sda1' ]
diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos
-Subproject 77b600ef0d64210c1b5fd72581cfe7752fa00c8
+Subproject ffc697113c99fa1e955bdce068d67ca15389856