Unhardcode root PV
Previously cloud-init scripts were trying to use vda3 as a root PV
unconditionally. OpenStack does not guarantee that the root drive
will always be vda, not vdb or vdc. Therefore we must really check
what drive is used as a LVM PV.
Closes-Bug: PROD-36380
Change-Id: Ife940f5b893a93147bdc550b7676795307c51e32
diff --git a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay-userdata.yaml b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay-userdata.yaml
index 567a445..bb6338c 100644
--- a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay-userdata.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay-userdata.yaml
@@ -20,7 +20,7 @@
all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
runcmd:
- - if lvs vg0; then pvresize /dev/vda3; fi
+ - if lvs vg0; then pvresize $(pvdisplay -C -S vg_name=vg0 -o pv_name --noheadings | tail -n1); fi
- if lvs vg0; then /usr/bin/growlvm.py --image-layout-file /usr/share/growlvm/image-layout.yml; fi
- export TERM=linux
@@ -75,4 +75,7 @@
devices:
- '/'
- '/dev/vda3'
+ - '/dev/vdb3'
+ - '/dev/vdc3'
+ - '/dev/vdd3'
ignore_growroot_disabled: false