From 65bb9d0d83762e8fa8e3ab568c801908eafa0686 Mon Sep 17 00:00:00 2001
From: Brinda Santh <bs2796@att.com>
Date: Wed, 5 Feb 2020 15:51:03 -0500
Subject: Cluster co-ordination with Hazelcast.

Remove Atomix implementation, due to Kubernetes clustering issues.

Cluster environment property changes.

Issue-ID: CCSDK-2011
Signed-off-by: Brinda Santh <bs2796@att.com>
Change-Id: I23f40c92c0adc6b3ab8690871385f78525c76433
---
 .../src/main/dc/docker-compose-cluster.yaml        | 71 +++++++++++++++-------
 1 file changed, 49 insertions(+), 22 deletions(-)

(limited to 'ms/blueprintsprocessor/application/src/main/dc')

diff --git a/ms/blueprintsprocessor/application/src/main/dc/docker-compose-cluster.yaml b/ms/blueprintsprocessor/application/src/main/dc/docker-compose-cluster.yaml
index d53b85f98..451f35c3a 100644
--- a/ms/blueprintsprocessor/application/src/main/dc/docker-compose-cluster.yaml
+++ b/ms/blueprintsprocessor/application/src/main/dc/docker-compose-cluster.yaml
@@ -44,7 +44,7 @@ services:
       - cds-network
     ports:
       - "8000:8080"
-      - "9111:9111"
+      - "9110:9111"
     restart: always
     volumes:
       - target: /opt/app/onap/blueprints/deploy
@@ -58,26 +58,58 @@ services:
       CLUSTER_ENABLED: "true"
       CLUSTER_ID: cds-cluster
       CLUSTER_NODE_ID: cds-controller-0
-      CLUSTER_MEMBERS: cds-controller-0,resource-resolution-0
-      CLUSTER_STORAGE_PATH: /opt/app/onap/config/cluster
-      #CLUSTER_CONFIG_FILE: /opt/app/onap/config/atomix/atomix-multicast.conf
+      CLUSTER_JOIN_AS_CLIENT: "false"
+      CLUSTER_CONFIG_FILE: /opt/app/onap/config/hazelcast/hazelcast.yaml
       NATS_CLUSTER_ID: cds-cluster
       APP_NAME: cds-controller
       BUNDLEVERSION: 1.0.0
       APP_CONFIG_HOME: /opt/app/onap/config
       STICKYSELECTORKEY:
       ENVCONTEXT: dev
-  resource-resolution-0:
+  cds-controller-1:
     depends_on:
       - db
       - nats
     image: onap/ccsdk-blueprintsprocessor:latest
-    container_name: resource-resolution-0
-    hostname: resource-resolution-0
+    container_name: cds-controller-1
+    hostname: cds-controller-1
     networks:
       - cds-network
     ports:
       - "8001:8080"
+      - "9111:9111"
+    restart: always
+    volumes:
+      - target: /opt/app/onap/blueprints/deploy
+        type: volume
+        source: blueprints-deploy
+      - target: /opt/app/onap/config
+        type: volume
+        source: controller-config
+    environment:
+      # Same as hostname and container name
+      CLUSTER_ENABLED: "true"
+      CLUSTER_ID: cds-cluster
+      CLUSTER_NODE_ID: cds-controller-1
+      CLUSTER_JOIN_AS_CLIENT: "false"
+      CLUSTER_CONFIG_FILE: /opt/app/onap/config/hazelcast/hazelcast.yaml
+      NATS_CLUSTER_ID: cds-cluster
+      APP_NAME: cds-controller
+      BUNDLEVERSION: 1.0.0
+      APP_CONFIG_HOME: /opt/app/onap/config
+      STICKYSELECTORKEY:
+      ENVCONTEXT: dev
+  cds-controller-2:
+    depends_on:
+      - db
+      - nats
+    image: onap/ccsdk-blueprintsprocessor:latest
+    container_name: cds-controller-2
+    hostname: cds-controller-2
+    networks:
+      - cds-network
+    ports:
+      - "8002:8080"
       - "9112:9111"
     restart: always
     volumes:
@@ -86,16 +118,16 @@ services:
         source: blueprints-deploy
       - target: /opt/app/onap/config
         type: volume
-        source: resource-resolution-config
+        source: controller-config
     environment:
+      # Same as hostname and container name
       CLUSTER_ENABLED: "true"
       CLUSTER_ID: cds-cluster
-      CLUSTER_NODE_ID: resource-resolution-0
-      CLUSTER_MEMBERS: cds-controller-0,resource-resolution-0
-      CLUSTER_STORAGE_PATH: /opt/app/onap/config/cluster
-      #CLUSTER_CONFIG_FILE: /opt/app/onap/config/atomix/atomix-multicast.conf
+      CLUSTER_NODE_ID: cds-controller-2
+      CLUSTER_JOIN_AS_CLIENT: "false"
+      CLUSTER_CONFIG_FILE: /opt/app/onap/config/hazelcast/hazelcast.yaml
       NATS_CLUSTER_ID: cds-cluster
-      APP_NAME: resource-resolution
+      APP_NAME: cds-controller
       BUNDLEVERSION: 1.0.0
       APP_CONFIG_HOME: /opt/app/onap/config
       STICKYSELECTORKEY:
@@ -119,7 +151,8 @@ services:
     environment:
       CLUSTER_ID: cds-cluster
       CLUSTER_NODE_ID: py-executor-0
-      CLUSTER_MEMBERS: cds-controller-0,resource-resolution-0,py-executor-0
+      CLUSTER_JOIN_AS_CLIENT: "false"
+      CLUSTER_CONFIG_FILE: /opt/app/onap/config/hazelcast/hazelcast.yaml
       NATS_CLUSTER_ID: cds-cluster
       APP_NAME: py-executor
       BUNDLEVERSION: 1.0.0
@@ -140,7 +173,7 @@ volumes:
     driver: local
     driver_opts:
       type: none
-      device: /opt/app/cds/nats/nats-0/store
+      device: /opt/app/cds/nats/store
       o: bind
   blueprints-deploy:
     driver: local
@@ -152,13 +185,7 @@ volumes:
     driver: local
     driver_opts:
       type: none
-      device: /opt/app/cds/cds-controller/cds-controller-0/config
-      o: bind
-  resource-resolution-config:
-    driver: local
-    driver_opts:
-      type: none
-      device: /opt/app/cds/resource-resolution/resource-resolution-0/config
+      device: /opt/app/cds/cds-controller/config
       o: bind
 
 networks:
-- 
cgit 1.2.3-korg