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

5 files changed, 32 insertions, 76 deletions

diff --git a/ms/blueprintsprocessor/application/src/main/resources/atomix/atomix-bootstrap.conf b/ms/blueprintsprocessor/application/src/main/resources/atomix/atomix-bootstrap.conf
deleted file mode 100644
index 0fc31e00f..000000000
--- a/ms/blueprintsprocessor/application/src/main/resources/atomix/atomix-bootstrap.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-cluster {
-  # Configure the cluster node information.
-  node {
-    id: ${CLUSTER_NODE_ID}
-    address: ${CLUSTER_NODE_ADDRESS}
-  }
-  # Configure the node discovery protocol.
-  discovery {
-    type: bootstrap
-    nodes.1 {
-      id: cds-controller-1
-      address: "cds-controller-1:5679"
-    }
-    nodes.2 {
-      id: resource-reolution-1
-      address: "resource-reolution-1:5679"
-    }
-  }
-}
-# Configure the system management group.
-managementGroup {
-  type: raft
-  name: system
-  partitions: 1
-  members: [${CLUSTER_MEMBERS}]
-  storage {
-    directory: ${CLUSTER_STORAGE_PATH}/data-${CLUSTER_NODE_ID}
-    level: DISK
-  }
-}
-# Configure a Raft partition group.
-partitionGroups.data {
-  type: primary-backup
-  partitions: 7
-}
diff --git a/ms/blueprintsprocessor/application/src/main/resources/atomix/atomix-multicast.conf b/ms/blueprintsprocessor/application/src/main/resources/atomix/atomix-multicast.conf
deleted file mode 100644
index fd161879c..000000000
--- a/ms/blueprintsprocessor/application/src/main/resources/atomix/atomix-multicast.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-cluster {
-  # Configure the cluster node information.
-  node {
-    id: ${CLUSTER_NODE_ID}
-    address: ${CLUSTER_NODE_ADDRESS}
-  }
-  # Configure the node discovery protocol.
-  discovery {
-    type: multicast
-  }
-  multicast: {
-    enabled: true
-    port: 54321
-  }
-  # Configure the SWIM membership protocol.
-  protocol {
-    type: swim
-    broadcastUpdates: true
-    gossipInterval: 500ms
-    probeInterval: 2s
-    suspectProbes: 2
-  }
-}
-# Configure the system management group.
-managementGroup {
-  type: raft
-  name: system
-  partitions: 1
-  members: [${CLUSTER_MEMBERS}]
-  storage {
-    directory: ${CLUSTER_STORAGE_PATH}/data-${CLUSTER_NODE_ID}
-    level: DISK
-  }
-}
-
-# Configure a Raft partition group.
-partitionGroups.data {
-  type: primary-backup
-  partitions: 7
-}
diff --git a/ms/blueprintsprocessor/application/src/main/resources/hazelcast/hazelcast-client.yaml b/ms/blueprintsprocessor/application/src/main/resources/hazelcast/hazelcast-client.yaml
new file mode 100644
index 000000000..e60b5dfc4
--- /dev/null
+++ b/ms/blueprintsprocessor/application/src/main/resources/hazelcast/hazelcast-client.yaml
@@ -0,0 +1,13 @@
+hazelcast-client:
+  cluster-name: ${CLUSTER_ID}
+  instance-name: ${CLUSTER_NODE_ID}
+
+  network:
+    cluster-members:
+      - 127.0.0.1:5701
+#    kubernetes:
+#      enabled: true
+#      namespace: MY-KUBERNETES-NAMESPACE
+#      service-name: MY-SERVICE-NAME
+#      service-label-name: MY-SERVICE-LABEL-NAME
+#      service-label-value: MY-SERVICE-LABEL-VALUE
diff --git a/ms/blueprintsprocessor/application/src/main/resources/hazelcast/hazelcast.yaml b/ms/blueprintsprocessor/application/src/main/resources/hazelcast/hazelcast.yaml
new file mode 100644
index 000000000..bacbe2a45
--- /dev/null
+++ b/ms/blueprintsprocessor/application/src/main/resources/hazelcast/hazelcast.yaml
@@ -0,0 +1,18 @@
+hazelcast:
+  cluster-name: ${CLUSTER_ID}
+  instance-name: ${CLUSTER_NODE_ID}
+  lite-member:
+    enabled: false
+  cp-subsystem:
+    cp-member-count: 3
+    group-size: 3
+#  network:
+#    join:
+#      multicast:
+#        enabled: false
+#      kubernetes:
+#        enabled: true
+#        namespace: MY-KUBERNETES-NAMESPACE
+#        service-name: MY-SERVICE-NAME
+#        service-label-name: MY-SERVICE-LABEL-NAME
+#        service-label-value: MY-SERVICE-LABEL-VALUE
\ No newline at end of file
diff --git a/ms/blueprintsprocessor/application/src/main/resources/logback.xml b/ms/blueprintsprocessor/application/src/main/resources/logback.xml
index 63ede28b4..aceea4327 100644
--- a/ms/blueprintsprocessor/application/src/main/resources/logback.xml
+++ b/ms/blueprintsprocessor/application/src/main/resources/logback.xml
@@ -28,7 +28,7 @@
     <logger name="org.springframework" level="info"/>
     <logger name="org.springframework.web" level="info"/>
     <logger name="org.hibernate" level="error"/>
-    <logger name="io.atomix" level="warn"/>
+    <logger name="com.hazelcast" level="error"/>
     <logger name="org.onap.ccsdk.cds" level="info"/>
 
     <root level="info">