Make generation of VM MAC addresses idempotent.

[icn.git] / deploy / metal3-vm / 02_configure_host.sh

diff --git a/deploy/metal3-vm/02_configure_host.sh b/deploy/metal3-vm/02_configure_host.sh
index e2d3c77..de48d9b 100755 (executable)
--- a/deploy/metal3-vm/02_configure_host.sh
+++ b/deploy/metal3-vm/02_configure_host.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -xe
+set -eux -o pipefail
 
 # shellcheck disable=SC1091
 source lib/logging.sh
@@ -145,7 +145,7 @@ if [[ "$MANAGE_BR_BRIDGE" == "y" && $OS == "centos" ]] ; then
   fi
 fi
 
-for name in ironic ironic-inspector dnsmasq httpd mariadb ipa-downloader; do                  
+for name in ironic ironic-inspector dnsmasq httpd mariadb ipa-downloader; do
     sudo "${CONTAINER_RUNTIME}" ps | grep -w "$name$" && sudo "${CONTAINER_RUNTIME}" kill $name
     sudo "${CONTAINER_RUNTIME}" ps --all | grep -w "$name$" && sudo "${CONTAINER_RUNTIME}" rm $name -f
 done
@@ -184,6 +184,7 @@ fi
 cat <<EOF > ${PWD}/ironic.env                                                 
 PROVISIONING_INTERFACE=provisioning                                               
 DHCP_RANGE=172.22.0.10,172.22.0.100                                               
+IPA_BASEURI=https://images.rdoproject.org/train/rdo_trunk/current-tripleo
 DEPLOY_KERNEL_URL=http://172.22.0.1/images/ironic-python-agent.kernel             
 DEPLOY_RAMDISK_URL=http://172.22.0.1/images/ironic-python-agent.initramfs         
 IRONIC_ENDPOINT=http://172.22.0.1:6385/v1/