openshift disconnected_vm_name to force registry fqdn

docs/index.md

@@ -1842,6 +1842,7 @@ You can fine tweak this registry with several parameters:
 - disconnected_user
 - disconnected_password
 - disconnected_operators
+- disconnected_vm_name
 - ...
 
 Note that this disconnected registry can also be deployed on its own using `kcli create openshift-registry` subcommand

docs/index.rst

@@ -1984,6 +1984,7 @@ You can fine tweak this registry with several parameters:
 -  disconnected_user
 -  disconnected_password
 -  disconnected_operators
+-  disconnected_vm_name
 -  …
 
 Note that this disconnected registry can also be deployed on its own using ``kcli create openshift-registry`` subcommand

kvirt/cluster/openshift/disconnected/bin/sync_image.sh

@@ -1,5 +1,5 @@
 IP=$(ip -o addr show eth0 | grep -v '169.254\|fe80::' | tail -1 | awk '{print $4}' | cut -d'/' -f1)
-REGISTRY_NAME=$(echo $IP | sed 's/\./-/g' | sed 's/:/-/g').sslip.io
+REGISTRY_NAME={{ disconnected_vm_name or "$(echo $IP | sed 's/\./-/g' | sed 's/:/-/g').sslip.io" }}
 REGISTRY=$REGISTRY_NAME:5000
 PULL_SECRET="/root/openshift_pull.json"
 image=$1

kvirt/cluster/openshift/disconnected/scripts/03_mirror.sh

@@ -1,7 +1,7 @@
 export PATH=/root/bin:$PATH
 export PULL_SECRET=/root/openshift_pull.json
 IP=$(ip -o addr show eth0 | grep -v '169.254\|fe80::' | tail -1 | awk '{print $4}' | cut -d'/' -f1)
-REGISTRY_NAME=$(echo $IP | sed 's/\./-/g' | sed 's/:/-/g').sslip.io
+REGISTRY_NAME={{ disconnected_vm_name or "$(echo $IP | sed 's/\./-/g' | sed 's/:/-/g').sslip.io" }}
 REGISTRY_USER={{ disconnected_user if disconnected_user != None else 'dummy' }}
 REGISTRY_PASSWORD={{ disconnected_password if disconnected_password != None else 'dummy' }}
 {% if openshift_release_image is defined and openshift_version is defined %}

kvirt/cluster/openshift/disconnected/scripts/03_registry.sh

@@ -2,7 +2,7 @@ export PATH=/root/bin:$PATH
 export PULL_SECRET=/root/openshift_pull.json
 export REGISTRY_IMAGE=quay.io/karmab/registry:latest
 IP=$(ip -o addr show eth0 | grep -v '169.254\|fe80::' | tail -1 | awk '{print $4}' | cut -d'/' -f1)
-REGISTRY_NAME=$(echo $IP | sed 's/\./-/g' | sed 's/:/-/g').sslip.io
+REGISTRY_NAME={{ disconnected_vm_name or "$(echo $IP | sed 's/\./-/g' | sed 's/:/-/g').sslip.io" }}
 echo $REGISTRY_NAME:5000 > /root/url.txt
 REGISTRY_USER={{ disconnected_user if disconnected_user != None else 'dummy' }}
 REGISTRY_PASSWORD={{ disconnected_password if disconnected_password != None else 'dummy' }}

kvirt/cluster/openshift/disconnected/scripts/05_olm.sh

@@ -4,7 +4,7 @@ cd /root
 export PATH=/root/bin:$PATH
 export OCP_PULLSECRET_AUTHFILE='/root/openshift_pull.json'
 IP=$(ip -o addr show eth0 | grep -v '169.254\|fe80::' | tail -1 | awk '{print $4}' | cut -d'/' -f1)
-REGISTRY_NAME=$(echo $IP | sed 's/\./-/g' | sed 's/:/-/g').sslip.io
+REGISTRY_NAME={{ disconnected_vm_name or "$(echo $IP | sed 's/\./-/g' | sed 's/:/-/g').sslip.io" }}
 export LOCAL_REGISTRY=$REGISTRY_NAME:5000
 export IMAGE_TAG=olm
 

kvirt/cluster/openshift/kcli_default.yml

@@ -71,6 +71,7 @@ extra_ctlplane_networks: []
 extra_worker_networks: []
 disconnected_url:
 disconnected_vm: false
+disconnected_vm_name:
 disconnected_update: false
 disconnected_haproxy: false
 disconnected_reuse: false