diff options
| author | Michael Hudson-Doyle <michael.hudson@linaro.org> | 2014-08-27 10:47:54 +1200 |
|---|---|---|
| committer | Michael Hudson-Doyle <michael.hudson@linaro.org> | 2014-08-27 10:47:54 +1200 |
| commit | af561e341eed613ae3eb9637bc299d33c6efcdfa (patch) | |
| tree | 5fc924fe9cd4f53b484e13ded167fc7963dca608 | |
| parent | 02e6fb85a2790c58f7b5185d47e3ab11e4ed6735 (diff) | |
use $(lava-self) has hostname if available
| -rw-r--r-- | cloud-seed/meta-data | 2 | ||||
| -rw-r--r-- | lavatest.yaml | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/cloud-seed/meta-data b/cloud-seed/meta-data index 11488b1..7516624 100644 --- a/cloud-seed/meta-data +++ b/cloud-seed/meta-data @@ -1,2 +1,2 @@ instance-id: no-id -local-hostname: linaro-test +local-hostname: @HOSTNAME@ diff --git a/lavatest.yaml b/lavatest.yaml index 55f5773..02703d4 100644 --- a/lavatest.yaml +++ b/lavatest.yaml @@ -43,6 +43,12 @@ run: - "mount /dev/sda1 /mnt" - "mkdir -p /mnt/var/lib/cloud/seed/nocloud-net" - "cp -a cloud-seed/* /mnt/var/lib/cloud/seed/nocloud-net/" + - "if type -p lava-self > /dev/null; then" + - " HOSTNAME=$(lava-self)" + - "else" + - " HOSTNAME=linaro-test" + - "fi" + - 'find /mnt/var/lib/cloud/seed/nocloud-net/ -type f -print0 | xargs -0 sed -i "s/@HOSTNAME@/$HOSTNAME/g"' - "mv /mnt/etc/resolv.conf /mnt/etc/resolv.conf.bak" - "cp /etc/resolv.conf /mnt/etc/resolv.conf" - "mount -t proc procfs /mnt/proc" |