From: David Garcia <david.garcia@canonical.com>
Date: Wed, 5 May 2021 12:22:26 +0000 (+0200)
Subject: Fix bug 1527
X-Git-Tag: release-v10.0-start~18
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fdevops.git;a=commitdiff_plain;h=c395a45423e2f7cce7edae2ab4168d9ec5b51d49

Fix bug 1527

Move from xip.io to nip.io

Change-Id: Id861f8dac7c38786544383985a1a75cf0bce16df
Signed-off-by: David Garcia <david.garcia@canonical.com>
---

diff --git a/installers/charm/grafana/tests/test_charm.py b/installers/charm/grafana/tests/test_charm.py
index 5db3edab..714730d1 100644
--- a/installers/charm/grafana/tests/test_charm.py
+++ b/installers/charm/grafana/tests/test_charm.py
@@ -42,7 +42,7 @@ class TestCharm(unittest.TestCase):
             "max_file_size": 0,
             "ingress_whitelist_source_range": "",
             "tls_secret_name": "",
-            "site_url": "https://grafana.192.168.100.100.xip.io",
+            "site_url": "https://grafana.192.168.100.100.nip.io",
             "cluster_issuer": "vault-issuer",
             "osm_dashboards": True,
         }
diff --git a/installers/charm/nbi/tests/test_charm.py b/installers/charm/nbi/tests/test_charm.py
index 2b4ea0fe..65433351 100644
--- a/installers/charm/nbi/tests/test_charm.py
+++ b/installers/charm/nbi/tests/test_charm.py
@@ -47,7 +47,7 @@ class TestCharm(unittest.TestCase):
             "max_file_size": 0,
             "ingress_whitelist_source_range": "",
             "tls_secret_name": "",
-            "site_url": "https://nbi.192.168.100.100.xip.io",
+            "site_url": "https://nbi.192.168.100.100.nip.io",
             "cluster_issuer": "vault-issuer",
         }
         self.harness.update_config(self.config)
diff --git a/installers/charm/ng-ui/tests/test_charm.py b/installers/charm/ng-ui/tests/test_charm.py
index 38ad38b8..2765e81c 100644
--- a/installers/charm/ng-ui/tests/test_charm.py
+++ b/installers/charm/ng-ui/tests/test_charm.py
@@ -44,7 +44,7 @@ class TestCharm(unittest.TestCase):
             "max_file_size": 0,
             "ingress_whitelist_source_range": "",
             "tls_secret_name": "",
-            "site_url": "https://ui.192.168.100.100.xip.io",
+            "site_url": "https://ui.192.168.100.100.nip.io",
             "cluster_issuer": "vault-issuer",
         }
         self.harness.update_config(self.config)
diff --git a/installers/charm/prometheus/tests/test_charm.py b/installers/charm/prometheus/tests/test_charm.py
index 0713a845..66e199d2 100644
--- a/installers/charm/prometheus/tests/test_charm.py
+++ b/installers/charm/prometheus/tests/test_charm.py
@@ -44,7 +44,7 @@ class TestCharm(unittest.TestCase):
             "max_file_size": 0,
             "ingress_whitelist_source_range": "",
             "tls_secret_name": "",
-            "site_url": "https://prometheus.192.168.100.100.xip.io",
+            "site_url": "https://prometheus.192.168.100.100.nip.io",
             "cluster_issuer": "vault-issuer",
             "enable_web_admin_api": False,
         }
diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 107397fc..e0c3e02a 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -266,10 +266,10 @@ function deploy_charmed_osm(){
         API_SERVER="$(echo $hostport | sed -e 's,:.*,,g')"
     fi
     # Expose OSM services
-    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 grafana site_url=https://grafana.${API_SERVER}.xip.io
-    juju config -m $MODEL_NAME prometheus site_url=https://prometheus.${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
+    juju config -m $MODEL_NAME grafana site_url=https://grafana.${API_SERVER}.nip.io
+    juju config -m $MODEL_NAME prometheus site_url=https://prometheus.${API_SERVER}.nip.io
 
     echo "Waiting for deployment to finish..."
     check_osm_deployed
diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index 72cf2cd9..b080ebe0 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -457,9 +457,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',
@@ -505,7 +505,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