From 82a713127fa0ab8770695238393d6712262fd005 Mon Sep 17 00:00:00 2001
From: Honza Pokorny <honza@redhat.com>
Date: Tue, 19 Nov 2019 14:45:12 -0400
Subject: [PATCH] Make local registry address configurable

Or, in other words, let's not hardcode it anymore
---
 04_setup_ironic.sh | 8 ++++----
 common.sh          | 4 +++-
 config_example.sh  | 2 ++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/04_setup_ironic.sh b/04_setup_ironic.sh
index 7cfa690c7..2d9534356 100755
--- a/04_setup_ironic.sh
+++ b/04_setup_ironic.sh
@@ -33,15 +33,15 @@ for IMAGE_VAR in $(env | grep "_LOCAL_IMAGE=" | grep -o "^[^=]*") ; do
         [ -e "$REPOPATH" ] || git clone $IMAGE $REPOPATH
         cd $REPOPATH
         export $IMAGE_VAR=${IMAGE##*/}:latest
-        export $IMAGE_VAR=192.168.111.1:5000/localimages/${!IMAGE_VAR}
+        export $IMAGE_VAR=$LOCAL_REGISTRY_ADDRESS/localimages/${!IMAGE_VAR}
         sudo podman build -t ${!IMAGE_VAR} .
         cd -
         sudo podman push --tls-verify=false ${!IMAGE_VAR} ${!IMAGE_VAR}
     fi
 
-    # Update the bootstrap and master nodes to treat 192.168.111.1:5000 as insecure
+    # Update the bootstrap and master nodes to treat LOCAL_REGISTRY_ADDRESS as insecure
     mkdir -p $OPENSHIFT_INSTALL_PATH/data/data/bootstrap/baremetal/files/etc/containers
-    echo -e "[registries.insecure]\nregistries = ['192.168.111.1:5000']" > $OPENSHIFT_INSTALL_PATH/data/data/bootstrap/baremetal/files/etc/containers/registries.conf
+    echo -e "[registries.insecure]\nregistries = ['${LOCAL_REGISTRY_ADDRESS}']" > $OPENSHIFT_INSTALL_PATH/data/data/bootstrap/baremetal/files/etc/containers/registries.conf
     cp assets/templates/99_local-registry.yaml.optional assets/templates/99_local-registry.yaml
 
     IMAGE_NAME=$(echo ${IMAGE_VAR/_LOCAL_IMAGE} | tr '[:upper:]_' '[:lower:]-')
@@ -78,7 +78,7 @@ IRONIC_IPA_DOWNLOADER_IMAGE=${IRONIC_IPA_DOWNLOADER_LOCAL_IMAGE:-$IRONIC_IPA_DOW
 IRONIC_RHCOS_DOWNLOADER_IMAGE=${IRONIC_RHCOS_DOWNLOADER_LOCAL_IMAGE:-$IRONIC_RHCOS_DOWNLOADER_IMAGE}
 
 for IMAGE in ${IRONIC_IMAGE} ${IRONIC_IPA_DOWNLOADER_IMAGE} ${IRONIC_RHCOS_DOWNLOADER_IMAGE} ${VBMC_IMAGE} ${SUSHY_TOOLS_IMAGE} ; do
-    sudo -E podman pull $([[ $IMAGE =~ 192.168.111.1:5000.* ]] && echo "--tls-verify=false" ) $IMAGE
+    sudo -E podman pull $([[ $IMAGE =~ $LOCAL_REGISTRY_ADDRESS.* ]] && echo "--tls-verify=false" ) $IMAGE
 done
 
 rm -rf $REGISTRY_AUTH_FILE
diff --git a/common.sh b/common.sh
index 740395149..6a41d67c6 100644
--- a/common.sh
+++ b/common.sh
@@ -39,6 +39,8 @@ if [ -z "${CONFIG:-}" ]; then
 fi
 source $CONFIG
 
+export LOCAL_REGISTRY_ADDRESS=${LOCAL_REGISTRY_ADDRESS:-"192.168.111.1:5000"}
+
 #
 # See https://openshift-release.svc.ci.openshift.org for release details
 #
@@ -78,7 +80,7 @@ fi
 
 if env | grep -q "_LOCAL_IMAGE=" ; then
     # We're going to be using a locally modified release image
-    export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="192.168.111.1:5000/localimages/local-release-image:latest" 
+    export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE="${LOCAL_REGISTRY_ADDRESS}/localimages/local-release-image:latest"
 fi
 
 # Set variables
diff --git a/config_example.sh b/config_example.sh
index bf60fb3c0..b97d647fc 100644
--- a/config_example.sh
+++ b/config_example.sh
@@ -69,3 +69,5 @@ set -x
 
 # Name of branch in the above repo which contains the custom MAO changes
 #export MAO_BRANCH="mao-fix"
+
+#export LOCAL_REGISTRY_ADDRESS="192.168.111.1:5000"