corosync: update corosync.conf to 3.x

Update corosync.conf to make it valid after corosync
upgrades to 3.x.

Reference: https://sources.debian.org/data/main/c/corosync/3.0.3-2/debian/patches/Make-the-example-config-valid.patch

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

1 files changed, 44 insertions, 41 deletions

diff --git a/meta-networking/recipes-extended/corosync/corosync/corosync.conf b/meta-networking/recipes-extended/corosync/corosync/corosync.conf
index 6aef9de950..744a30ff55 100644
--- a/meta-networking/recipes-extended/corosync/corosync/corosync.conf
+++ b/meta-networking/recipes-extended/corosync/corosync/corosync.conf
@@ -1,58 +1,61 @@
-# Starting point for cluster with pacemaker/openais
-compatibility: none
-
-corosync {
-         user:  root
-         group: root
-}
-
-aisexec {
-        with Pacemaker
-        user:  root
-        group: root
-}
-
-service {
-        name: pacemaker
-        ver: 1
-}
-
+# Please read the corosync.conf.5 manual page
 totem {
         version: 2
-        secauth: off
-        threads: 0
-        interface {
-                ringnumber: 0
-                # Cluster network address
-                bindnetaddr: 192.168.10.0
-                # Should be fine in most cases, don't forget to allow
-                # packets for this address/port in netfilter if there
-                # is restrictive policy set for cluster network
-                mcastaddr: 226.94.1.1
-                mcastport: 5405
-        }
+
+        # Set name of the cluster
+        cluster_name: testCluster
+
+        # crypto_cipher and crypto_hash: Used for mutual node authentication.
+        # If you choose to enable this, then do remember to create a shared
+        # secret with "corosync-keygen".
+        # enabling crypto_cipher, requires also enabling of crypto_hash.
+        # crypto works only with knet transport
+        crypto_cipher: none
+        crypto_hash: none
 }
 
 logging {
+        # Log the source file and line where messages are being
+        # generated. When in doubt, leave off. Potentially useful for
+        # debugging.
         fileline: off
-        to_stderr: no
+        # Log to standard error. When in doubt, set to yes. Useful when
+        # running in the foreground (when invoking "corosync -f")
+        to_stderr: yes
+        # Log to a log file. When set to "no", the "logfile" option
+        # must not be set.
         to_logfile: yes
-        to_syslog: yes
         logfile: /var/log/cluster/corosync.log
+        # Log to the system log daemon. When in doubt, set to yes.
+        to_syslog: yes
+        # Log debug messages (very verbose). When in doubt, leave off.
         debug: off
-        timestamp: on
+        # Log messages with time stamps. When in doubt, set to hires (or on)
+        #timestamp: hires
         logger_subsys {
-                subsys: AMF
+                subsys: QUORUM
                 debug: off
         }
 }
 
-amf {
-        mode: disabled
-}
-
 quorum {
-        # Quorum for the Pacemaker Cluster Resource Manager
+        # Enable and configure quorum subsystem (default: off)
+        # see also corosync.conf.5 and votequorum.5
         provider: corosync_votequorum
-        expected_votes: 1
+}
+
+nodelist {
+        # Change/uncomment/add node sections to match cluster configuration
+
+        node {
+                # Hostname of the node
+                name: node1
+                # Cluster membership node identifier
+                nodeid: 1
+                # Address of first link
+                ring0_addr: 127.0.0.1
+                # When knet transport is used it's possible to define up to 8 links
+                #ring1_addr: 192.168.1.1
+        }
+        # ...
 }