Skip to content
Snippets Groups Projects
Commit 1d704d9e authored by Mark Beierl's avatar Mark Beierl
Browse files

Fix 1527 for v9.0


Manual cherry pick of c395a454 to swtich from defunct xip.io to nip.io

Fixes bug 1527 in v9.0

Change-Id: I56ba9ef730a3b5ca6be4994cf7270605453fa459
Signed-off-by: default avatarbeierlm <mark.beierl@canonical.com>
parent c21f7810
No related branches found
No related tags found
No related merge requests found
......@@ -24,7 +24,7 @@ juju relate ng-ui nbi
## 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
```
......
......@@ -271,16 +271,16 @@ function deploy_charmed_osm(){
# 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
......
......@@ -417,9 +417,9 @@ node("${params.NODE}") {
--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 @@ node("${params.NODE}") {
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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment