Update broken IPA URL

The master URL is no longer available, replace with the latest (train)
image available at this time.

Issue-ID: ICN-490
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: I40a983b184bc0386c722c22aefb760dfdeba7d31

diff --git a/deploy/metal3-vm/02_configure_host.sh b/deploy/metal3-vm/02_configure_host.sh
index e99e8b5..de48d9b 100755 (executable)
--- a/deploy/metal3-vm/02_configure_host.sh
+++ b/deploy/metal3-vm/02_configure_host.sh
@@ -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/                                        

diff --git a/env/metal3/03_launch_prereq.sh b/env/metal3/03_launch_prereq.sh
index 8b2b056..75865b1 100755 (executable)
--- a/env/metal3/03_launch_prereq.sh
+++ b/env/metal3/03_launch_prereq.sh
@@ -158,6 +158,7 @@ function create_ironic_env {
     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/

diff --git a/env/ubuntu/bootloader-env/01_bootloader_package_req.sh b/env/ubuntu/bootloader-env/01_bootloader_package_req.sh
index 8bbb226..da4165d 100755 (executable)
--- a/env/ubuntu/bootloader-env/01_bootloader_package_req.sh
+++ b/env/ubuntu/bootloader-env/01_bootloader_package_req.sh
@@ -101,7 +101,7 @@ function download_build_packages {
     pushd $BUILD_DIR
     if [ ! -f ironic-python-agent.initramfs ]; then
     curl --insecure --compressed \
-        -L https://images.rdoproject.org/master/rdo_trunk/current-tripleo-rdo/ironic-python-agent.tar | tar -xf -
+        -L https://images.rdoproject.org/train/rdo_trunk/current-tripleo/ironic-python-agent.tar | tar -xf -
     fi
 
     if [[ "$BM_IMAGE_URL" && "$BM_IMAGE" ]]; then