diff --git a/hack/install-router.sh b/hack/install-router.sh index 620caf3c9760..cc7e2cb047a7 100755 --- a/hack/install-router.sh +++ b/hack/install-router.sh @@ -9,6 +9,11 @@ MASTER_URL="${2}" OPENSHIFT="${3}" OS_ROOT=$(dirname "${BASH_SOURCE}")/.. +if [[ -f /usr/share/openshift/examples/router.json ]]; then + ROUTER_JSON="/usr/share/openshift/examples/router.json" +else + ROUTER_JSON="${OS_ROOT}/images/router/haproxy/pod.json" +fi if [[ "${ROUTER_ID}" == "" ]]; then echo "No router id provided, cannot create router..." @@ -32,6 +37,10 @@ fi OPENSHIFT_INSECURE="${OPENSHIFT_INSECURE:-false}" OPENSHIFT_CA_DATA="${OPENSHIFT_CA_DATA:-}" +if [[ "${OPENSHIFT_CA_DATA}" == "" ]] && \ + [ -f /var/lib/openshift/openshift.local.certificates/master/root.crt ]; then + OPENSHIFT_CA_DATA=$(