diff --git a/asciidoc/product/atip-automated-provision.adoc b/asciidoc/product/atip-automated-provision.adoc index 84f5b1ad..a7170a97 100644 --- a/asciidoc/product/atip-automated-provision.adoc +++ b/asciidoc/product/atip-automated-provision.adoc @@ -289,6 +289,16 @@ fi mount -o ro $CONFIG_DRIVE /mnt +META_DATA_FILE="/mnt/openstack/latest/meta_data.json" +if [ ! -f "${META_DATA_FILE}" ]; then + umount /mnt + echo "No meta_data.json found, skipping hostname configuration" + exit 0 +fi + +DESIRED_HOSTNAME=$(cat /mnt/openstack/latest/meta_data.json | tr ',{}' '\n' | grep '"metal3-name"' | sed 's/.*\"metal3-name\": \"\(.*\)\"/\1/') +echo "${DESIRED_HOSTNAME}" > /etc/hostname + NETWORK_DATA_FILE="/mnt/openstack/latest/network_data.json" if [ ! -f "${NETWORK_DATA_FILE}" ]; then @@ -297,9 +307,6 @@ if [ ! -f "${NETWORK_DATA_FILE}" ]; then exit 0 fi -DESIRED_HOSTNAME=$(cat /mnt/openstack/latest/meta_data.json | tr ',{}' '\n' | grep '\"metal3-name\"' | sed 's/.*\"metal3-name\": \"\(.*\)\"/\1/') -echo "${DESIRED_HOSTNAME}" > /etc/hostname - mkdir -p /tmp/nmc/{desired,generated} cp ${NETWORK_DATA_FILE} /tmp/nmc/desired/_all.yaml umount /mnt diff --git a/asciidoc/quickstart/metal3.adoc b/asciidoc/quickstart/metal3.adoc index 490b26cd..bd36ecb0 100644 --- a/asciidoc/quickstart/metal3.adoc +++ b/asciidoc/quickstart/metal3.adoc @@ -381,6 +381,16 @@ fi mount -o ro $CONFIG_DRIVE /mnt +META_DATA_FILE="/mnt/openstack/latest/meta_data.json" +if [ ! -f "${META_DATA_FILE}" ]; then + umount /mnt + echo "No meta_data.json found, skipping hostname configuration" + exit 0 +fi + +DESIRED_HOSTNAME=$(cat /mnt/openstack/latest/meta_data.json | tr ',{}' '\n' | grep '"metal3-name"' | sed 's/.*\"metal3-name\": \"\(.*\)\"/\1/') +echo "${DESIRED_HOSTNAME}" > /etc/hostname + NETWORK_DATA_FILE="/mnt/openstack/latest/network_data.json" if [ ! -f "${NETWORK_DATA_FILE}" ]; then @@ -389,9 +399,6 @@ if [ ! -f "${NETWORK_DATA_FILE}" ]; then exit 0 fi -DESIRED_HOSTNAME=$(cat /mnt/openstack/latest/meta_data.json | tr ',{}' '\n' | grep '\"metal3-name\"' | sed 's/.*\"metal3-name\": \"\(.*\)\"/\1/') -echo "${DESIRED_HOSTNAME}" > /etc/hostname - mkdir -p /tmp/nmc/{desired,generated} cp ${NETWORK_DATA_FILE} /tmp/nmc/desired/_all.yaml umount /mnt