Fix 1527 for v9.0
Manual cherry pick of c395a45 to swtich from defunct xip.io to nip.io
Fixes bug 1527 in v9.0
Change-Id: I56ba9ef730a3b5ca6be4994cf7270605453fa459
Signed-off-by: beierlm <mark.beierl@canonical.com>
diff --git a/installers/charm/ng-ui/README.md b/installers/charm/ng-ui/README.md
index 9b77b5d..2cb8cf5 100644
--- a/installers/charm/ng-ui/README.md
+++ b/installers/charm/ng-ui/README.md
@@ -24,7 +24,7 @@
## How to expose the NG-UI through ingress
```bash
-juju config ng-ui site_url=ng.<k8s_worker_ip>.xip.io
+juju config ng-ui site_url=ng.<k8s_worker_ip>.nip.io
juju expose ng-ui
```
diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index e215ef2..c2b678b 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -271,16 +271,16 @@
# Expose OSM services
# Expose NBI
- juju config -m $MODEL_NAME nbi site_url=https://nbi.${API_SERVER}.xip.io
- juju config -m $MODEL_NAME ng-ui site_url=https://ui.${API_SERVER}.xip.io
+ juju config -m $MODEL_NAME nbi site_url=https://nbi.${API_SERVER}.nip.io
+ juju config -m $MODEL_NAME ng-ui site_url=https://ui.${API_SERVER}.nip.io
# Expose Grafana
- juju config -m $MODEL_NAME grafana-k8s juju-external-hostname=grafana.${API_SERVER}.xip.io
+ juju config -m $MODEL_NAME grafana-k8s juju-external-hostname=grafana.${API_SERVER}.nip.io
juju expose -m $MODEL_NAME grafana-k8s
wait_for_port grafana-k8s 0
# Expose Prometheus
- juju config -m $MODEL_NAME prometheus-k8s juju-external-hostname=prometheus.${API_SERVER}.xip.io
+ juju config -m $MODEL_NAME prometheus-k8s juju-external-hostname=prometheus.${API_SERVER}.nip.io
juju expose -m $MODEL_NAME prometheus-k8s
wait_for_port prometheus-k8s 1
diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index bdd9dd2..ee50a3f 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -417,9 +417,9 @@
--tag ${container_name}
"""
}
- prometheusHostname = "prometheus."+IP_ADDRESS+".xip.io"
+ prometheusHostname = "prometheus."+IP_ADDRESS+".nip.io"
prometheusPort = 80
- osmHostname = "nbi."+IP_ADDRESS+".xip.io:443"
+ osmHostname = "nbi."+IP_ADDRESS+".nip.io:443"
} else {
// Run -k8s installer here specifying internal docker registry and docker proxy
withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'gitlab-registry',
@@ -463,7 +463,7 @@
hostfile="${tempdir}/hosts"
sh """cat << EOF > ${hostfile}
127.0.0.1 localhost
-${remote.host} prometheus.${remote.host}.xip.io nbi.${remote.host}.xip.io
+${remote.host} prometheus.${remote.host}.nip.io nbi.${remote.host}.nip.io
EOF"""
} else {
hostfile=null