dind: Changed master and node config to allow local registry image fo…

…rmat if needed

images/dind/master/openshift-generate-master-config.sh

@@ -36,6 +36,11 @@ function ensure-master-config() {
     serving_ip_addr="${ip_addr1}"
   fi
 
+  local image_format=""
+  if [[ -n "${OPENSHIFT_IMAGE_FORMAT}" ]]; then
+    image_format="--images=${OPENSHIFT_IMAGE_FORMAT}"
+  fi
+
   mkdir -p "${config_path}"
   (flock 200;
    /usr/local/bin/oc adm ca create-master-certs \
@@ -46,6 +51,7 @@ function ensure-master-config() {
 
    /usr/local/bin/openshift start master --write-config="${master_path}" \
      --master="https://${serving_ip_addr}:8443" \
+     ${image_format} \
      --network-plugin="${OPENSHIFT_NETWORK_PLUGIN}" \
      ${OPENSHIFT_ADDITIONAL_ARGS}
   ) 200>"${config_path}"/.openshift-ca.lock

images/dind/node/openshift-generate-node-config.sh

@@ -51,6 +51,11 @@ function ensure-node-config() {
       ip_addrs="${ip_addr1}"
     fi
 
+    local image_format=""
+    if [[ -n "${OPENSHIFT_IMAGE_FORMAT}" ]]; then
+      image_format="--images=${OPENSHIFT_IMAGE_FORMAT}"
+    fi
+
     # Hold a lock on the shared volume to ensure cert generation is
     # performed serially.  Cert generation is not compatible with
     # concurrent execution since the file passed to --signer-serial
@@ -61,6 +66,7 @@ function ensure-node-config() {
        --node="${host}" \
        --master="${master_host}" \
        --dns-ip="172.30.0.1" \
+       ${image_format} \
        --hostnames="${host},${ip_addrs}" \
        --network-plugin="${OPENSHIFT_NETWORK_PLUGIN}" \
        --node-client-certificate-authority="${master_config_path}/ca.crt" \