clean-up solution

- remove fix host IPs and replace by aaa.bbb.ccc.ddd

Issue-ID: OAM-428
Change-Id: Ie73ea393439c18bd695fb25f30a817e7d46c9dc5
Signed-off-by: Martin Skorupski <martin.skorupski@highstreet-technologies.com>

diff --git a/solution/README.md b/solution/README.md
index 584c830..22ca79f 100644 (file)
--- a/solution/README.md
+++ b/solution/README.md
@@ -125,7 +125,7 @@ For development purposes <your-system> and <deployment-system> may reference the
 ```
 $ cat /etc/hosts
 127.0.0.1                     localhost
-127.0.1.1                     10.20.35.165
+127.0.1.1                     <your-system>
 
 # SMO OAM development system
 <deployment-system-ipv4>                   smo.o-ran-sc.org
@@ -133,6 +133,7 @@ $ cat /etc/hosts
 <deployment-system-ipv4>          identity.smo.o-ran-sc.org
 <deployment-system-ipv4>          messages.smo.o-ran-sc.org
 <deployment-system-ipv4>      kafka-bridge.smo.o-ran-sc.org
+<deployment-system-ipv4>          kafka-ui.smo.o-ran-sc.org
 <deployment-system-ipv4>         odlux.oam.smo.o-ran-sc.org
 <deployment-system-ipv4>         flows.oam.smo.o-ran-sc.org
 <deployment-system-ipv4>         tests.oam.smo.o-ran-sc.org

diff --git a/solution/network/.env b/solution/network/.env
index d9c3755..b91a382 100644 (file)
--- a/solution/network/.env
+++ b/solution/network/.env
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-HOST_IP=192.168.10.253
+HOST_IP=aaa.bbb.ccc.ddd
 # NETWORK_SUBNET_DCN_IPv4=172.60.0.0/24
 NETWORK_SUBNET_DCN_IPv6=2001:db8:1:50::/96
 

diff --git a/solution/network/o-ru-mplane/data/ietf-netconf-server-ssh-callhome.json b/solution/network/o-ru-mplane/data/ietf-netconf-server-ssh-callhome.json
index 018afd5..1120e29 100644 (file)
--- a/solution/network/o-ru-mplane/data/ietf-netconf-server-ssh-callhome.json
+++ b/solution/network/o-ru-mplane/data/ietf-netconf-server-ssh-callhome.json
@@ -10,7 +10,7 @@
                 "name": "default-ssh-callhome",
                 "ssh": {
                   "tcp-client-parameters": {
-                    "remote-address": "192.168.10.253",
+                    "remote-address": "aaa.bbb.ccc.ddd",
                     "remote-port": 4334
                   },
                   "ssh-server-parameters": {

diff --git a/solution/network/o-ru-mplane/data/ietf-netconf-server-template.json b/solution/network/o-ru-mplane/data/ietf-netconf-server-template.json
index f12cf39..d32f29e 100644 (file)
--- a/solution/network/o-ru-mplane/data/ietf-netconf-server-template.json
+++ b/solution/network/o-ru-mplane/data/ietf-netconf-server-template.json
@@ -84,7 +84,7 @@
                 "name": "default-ssh-callhome",
                 "ssh": {
                   "tcp-client-parameters": {
-                    "remote-address": "192.168.10.253",
+                    "remote-address": "aaa.bbb.ccc.ddd",
                     "remote-port": 4334
                   },
                   "ssh-server-parameters": {
@@ -130,7 +130,7 @@
                 "name": "tls-auth-endpt",
                 "tls": {
                   "tcp-client-parameters": {
-                    "remote-address": "192.168.10.253",
+                    "remote-address": "aaa.bbb.ccc.ddd",
                     "remote-port": 4335
                   },
                   "tls-server-parameters": {

diff --git a/solution/smo/apps/.env b/solution/smo/apps/.env
index b204814..ad733dc 100644 (file)
--- a/solution/smo/apps/.env
+++ b/solution/smo/apps/.env
@@ -19,7 +19,7 @@ ADMIN_USERNAME=admin
 ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 
 # Network settings
-HOST_IP=192.168.10.253
+HOST_IP=aaa.bbb.ccc.ddd
 
 # flows (implemened by nodered)
 FLOWS_IMAGE=nodered/node-red:latest

diff --git a/solution/smo/common/.env b/solution/smo/common/.env
index 49ac0f3..26810e8 100644 (file)
--- a/solution/smo/common/.env
+++ b/solution/smo/common/.env
@@ -46,6 +46,7 @@ ZOOKEEPER_IMAGE=nexus3.onap.org:10001/onap/dmaap/zookeeper:6.0.3
 ## Kafka
 KAFKA_IMAGE=nexus3.onap.org:10001/onap/dmaap/kafka111:1.0.4
 KAFKA_BRIDGE_IMAGE=quay.io/strimzi/kafka-bridge:0.25.0
+KAFKA_UI_IMAGE=provectuslabs/kafka-ui:v0.7.2
 
 ## Messages (DMaaP)
 DMAAP_IMAGE=nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.18

diff --git a/solution/smo/common/docker-compose.yaml b/solution/smo/common/docker-compose.yaml
index 030271c..dd91d26 100755 (executable)
--- a/solution/smo/common/docker-compose.yaml
+++ b/solution/smo/common/docker-compose.yaml
@@ -12,9 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
-# no more versions needed! Compose spec supports all features w/o a version
-version: "3.8"
+
 services:
   gateway:
     image: ${TRAEFIK_IMAGE}
@@ -252,6 +250,26 @@ services:
       dmz:
       default:
 
+  kafka-ui:
+    container_name: kafka-ui
+    image: ${KAFKA_UI_IMAGE}
+    environment:
+      KAFKA_CLUSTERS_0_NAME: kafka
+      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka:9092
+      DYNAMIC_CONFIG_ENABLED: 'true'
+    labels:
+      traefik.enable: true
+      traefik.http.routers.kafka-ui.entrypoints: websecure
+      traefik.http.routers.kafka-ui.rule: Host(`kafka-ui.${HTTP_DOMAIN}`)
+      traefik.http.routers.kafka-ui.tls: true
+      traefik.http.services.kafka-ui.loadbalancer.server.port: 8080
+      app: "kafka-ui"
+      deploy: "o-ran-sc-smo-common"
+      solution: "o-ran-sc-smo"
+    networks:
+      dmz:
+      default:
+      
   topology:
     image: "${O_RAN_SC_TOPOLOGY_IMAGE}"
     container_name: topology

diff --git a/solution/smo/oam/.env b/solution/smo/oam/.env
index 9357e9e..88f44bb 100644 (file)
--- a/solution/smo/oam/.env
+++ b/solution/smo/oam/.env
@@ -19,7 +19,7 @@ ADMIN_USERNAME=admin
 ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 
 # Network settings
-HOST_IP=192.168.10.253
+HOST_IP=aaa.bbb.ccc.ddd
 
 # traefik network
 HTTP_DOMAIN=smo.o-ran-sc.org