Update deployment of OSM to use input OSM_BASE_DOMAIN, otherwise set it from nginx IP address
Change-Id: I4a6191777e021924013f969f009623634b3d6aab
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/installers/00-default-install-options.rc b/installers/00-default-install-options.rc
index ea39c3a..345d8b2 100644
--- a/installers/00-default-install-options.rc
+++ b/installers/00-default-install-options.rc
@@ -46,7 +46,7 @@
export OSM_BEHIND_PROXY=
export OPENSHIFT_MGMT_CLUSTER=
export MGMT_CLUSTER_CA_FILE=
-export OSM_K8S_NGINX_IPADDRESS=
+export OSM_BASE_DOMAIN=
export OSM_HELM_TIMEOUT=
export OSM_CLUSTER_INGRESS_CLASS=
export AUX_CLUSTER_INGRESS_CLASS=
\ No newline at end of file
diff --git a/installers/01-export-osm-install-options.sh b/installers/01-export-osm-install-options.sh
index 86dc5d0..7fa0302 100755
--- a/installers/01-export-osm-install-options.sh
+++ b/installers/01-export-osm-install-options.sh
@@ -62,7 +62,7 @@
export OSM_BEHIND_PROXY=${OSM_BEHIND_PROXY}
export OPENSHIFT_MGMT_CLUSTER=${OPENSHIFT_MGMT_CLUSTER}
export MGMT_CLUSTER_CA_FILE=${MGMT_CLUSTER_CA_FILE}
-export OSM_K8S_NGINX_IPADDRESS=${OSM_K8S_NGINX_IPADDRESS}
+export OSM_BASE_DOMAIN=${OSM_BASE_DOMAIN}
export OSM_HELM_TIMEOUT=${OSM_HELM_TIMEOUT}
export OSM_CLUSTER_INGRESS_CLASS=${OSM_CLUSTER_INGRESS_CLASS}
export AUX_CLUSTER_INGRESS_CLASS=${AUX_CLUSTER_INGRESS_CLASS}
diff --git a/installers/40-deploy-osm.sh b/installers/40-deploy-osm.sh
index e13abd5..aaac38e 100755
--- a/installers/40-deploy-osm.sh
+++ b/installers/40-deploy-osm.sh
@@ -40,11 +40,12 @@
fi
export KUBECONFIG="${OSM_HOME_DIR}/clusters/kubeconfig-osm.yaml"
-if [ -z "${OSM_K8S_NGINX_IPADDRESS}" ]; then
- echo "OSM_K8S_NGINX_IPADDRESS is not set, will try to get it from the cluster"
+if [ -z "${OSM_BASE_DOMAIN}" ]; then
+ echo "OSM_BASE_DOMAIN is not set, will try to set it from the nginx ingress controller load balancer IP"
OSM_K8S_NGINX_IPADDRESS=$(kubectl get svc ingress-nginx-controller -n ingress-nginx -o jsonpath='{.status.loadBalancer.ingress[0].ip}' 2>/dev/null)
+ OSM_BASE_DOMAIN="${OSM_BASE_DOMAIN:-"${OSM_K8S_NGINX_IPADDRESS}.nip.io"}"
fi
-echo "Using OSM_K8S_NGINX_IPADDRESS=${OSM_K8S_NGINX_IPADDRESS}"
+echo "Using OSM_BASE_DOMAIN=${OSM_BASE_DOMAIN}"
# Create folder to store helm values
sudo mkdir -p ${OSM_HELM_WORK_DIR}
@@ -80,7 +81,6 @@
[ ! "$OSM_DOCKER_TAG" == "releaseeighteen-daily" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set-string global.image.tag=${OSM_DOCKER_TAG}"
[ ! "$OSM_DOCKER_TAG" == "releaseeighteen-daily" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set prometheus.server.sidecarContainers.prometheus-config-sidecar.image=${DOCKER_REGISTRY_URL}${DOCKER_USER}/prometheus:${OSM_DOCKER_TAG}"
-OSM_BASE_DOMAIN="${OSM_BASE_DOMAIN:-"${OSM_K8S_NGINX_IPADDRESS}.nip.io"}"
OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.hostname=${OSM_BASE_DOMAIN}"
if [ -n "${OSM_CLUSTER_INGRESS_CLASS}" ]; then
OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.ingressClassName=${OSM_CLUSTER_INGRESS_CLASS}"