diff --git a/CHECKSUM.MD5 b/CHECKSUM.MD5 index b110cb26..83c9ac01 100644 --- a/CHECKSUM.MD5 +++ b/CHECKSUM.MD5 @@ -149,7 +149,7 @@ bc1e5cb5c96d99b24886f1f527d3bb3d attr-2.4.48.tar.gz b5c184b13b6b5de32af630af2fd013fd sudo-1.8.27.tar.gz 1581a588fde9d89f6bc6201e8129afaf rsync-3.1.3.tar.gz 405ad50a9d24794a70d2709097058e63 zfs-0.8.3.tar.gz -489911ab946ec0463fcbcfb1663bb80e resource-agents-4.2.0.tar.gz +018fa1bbeeadd25a49bf26566a430034 resource-agents-4.17.0.tar.gz 65aa71b8d4cd4b927a7ec69b5d53ecc7 btier-1.3.11.tar.gz 9e251c0a618ad0824b51117d5d9db87e gperf-3.1.tar.gz 5ef9542c5d6490bc566855467abeb012 dlm-4.0.8.tar.xz diff --git a/CHECKSUM.SHA256 b/CHECKSUM.SHA256 index eebb0eed..e49eb0e4 100644 --- a/CHECKSUM.SHA256 +++ b/CHECKSUM.SHA256 @@ -149,7 +149,7 @@ d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57 htop-2.2.0.tar 7beb68b94471ef56d8a1036dbcdc09a7b58a949a68ffce48b83f837dd33e2ec0 sudo-1.8.27.tar.gz 55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0 rsync-3.1.3.tar.gz 545a4897ce30c2d2dd9010a0fdb600a0d3d45805e2387093c473efc03aa9d7fd zfs-0.8.3.tar.gz -37100f16d66d9c7aa5b3e98b31a994928dc5c40dd03d3dca7c9e1089f977de34 resource-agents-4.2.0.tar.gz +42fa1a0447ff59783466fb3fff1d050bd02be53a36eae829c3981886fffe807e resource-agents-4.17.0.tar.gz 63b9ad7d2e8a6dbddb43cf4c43e6bcec25e085371938d35e198fd7bb6b44bc61 btier-1.3.11.tar.gz 588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2 gperf-3.1.tar.gz 4cc6ab9fbd97ccccba3f00cf3e11e3272ff48cdf2141a4c66c90e29dcb733c58 dlm-4.0.8.tar.xz diff --git a/Makefile.in b/Makefile.in index ee016c4c..897149eb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -207,7 +207,7 @@ dist_files = $(addprefix $(DIST_FILES_DIR)/, \ libaio-0.3.111.tar.xz \ glue-1.0.12.tar.bz2 \ readline-8.0.tar.gz \ - resource-agents-4.2.0.tar.gz \ + resource-agents-4.17.0.tar.gz \ lzo-2.10.tar.gz \ fuse-2.9.7.tar.gz \ db-5.3.28.tar.gz \ diff --git a/etc/corosync/corosync.conf b/etc/corosync/corosync.conf index 7f9c686a..798ecfd2 100644 --- a/etc/corosync/corosync.conf +++ b/etc/corosync/corosync.conf @@ -1,51 +1,17 @@ # Please read the corosync.conf.5 manual page totem { version: 2 + + # Set name of the cluster cluster_name: esos # 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 - - # interface: define at least one interface to communicate - # over. If you define more than one interface stanza, you must - # also set rrp_mode. - interface { - # Rings must be consecutively numbered, starting at 0. - ringnumber: 0 - # This is normally the *network* address of the - # interface to bind to. This ensures that you can use - # identical instances of this configuration file - # across all your cluster nodes, without having to - # modify this option. - bindnetaddr: 127.0.0.0 - # However, if you have multiple physical network - # interfaces configured for the same subnet, then the - # network address alone is not sufficient to identify - # the interface Corosync should bind to. In that case, - # configure the *host* address of the interface - # instead: - # bindnetaddr: 192.168.1.1 - # When selecting a multicast address, consider RFC - # 2365 (which, among other things, specifies that - # 239.255.x.x addresses are left to the discretion of - # the network administrator). Do not reuse multicast - # addresses across multiple Corosync clusters sharing - # the same network. - mcastaddr: 239.255.1.1 - # Corosync uses the port you specify here for UDP - # messaging, and also the immediately preceding - # port. Thus if you set this to 5405, Corosync sends - # messages over UDP ports 5405 and 5404. - mcastport: 5405 - # Time-to-live for cluster communication packets. The - # number of hops (routers) that this ring will allow - # itself to pass. Note that multicast routing must be - # specifically enabled on most network routers. - ttl: 1 - } } logging { @@ -53,22 +19,19 @@ logging { # generated. When in doubt, leave off. Potentially useful for # debugging. fileline: off - # Log to standard error. When in doubt, set to no. Useful when + # Log to standard error. When in doubt, set to yes. Useful when # running in the foreground (when invoking "corosync -f") - to_stderr: no + to_stderr: yes # Log to a log file. When set to "no", the "logfile" option # must not be set. - #to_logfile: yes + to_logfile: no #logfile: /var/log/cluster/corosync.log # Log to the system log daemon. When in doubt, set to yes. to_syslog: yes - syslog_facility: local2 # Log debug messages (very verbose). When in doubt, leave off. debug: off - # Log messages with time stamps. When in doubt, set to on - # (unless you are only logging to syslog, where double - # timestamps can be annoying). - timestamp: off + # Log messages with time stamps. When in doubt, set to hires (or on) + #timestamp: hires logger_subsys { subsys: QUORUM debug: off @@ -78,6 +41,31 @@ logging { quorum { # Enable and configure quorum subsystem (default: off) # see also corosync.conf.5 and votequorum.5 - provider: corosync_votequorum - expected_votes: 1 + #provider: corosync_votequorum +} + +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: 192.168.0.1 + # When knet transport is used it's possible to define up to 8 links + #ring1_addr: 192.168.1.1 + } + node { + # Hostname of the node + name: node2 + # Cluster membership node identifier + nodeid: 2 + # Address of first link + #ring0_addr: 192.168.0.2 + # When knet transport is used it's possible to define up to 8 links + #ring1_addr: 192.168.1.2 + } + # ... } diff --git a/misc/resource-agents-4.2.0.patch b/misc/resource-agents-4.17.0.patch similarity index 100% rename from misc/resource-agents-4.2.0.patch rename to misc/resource-agents-4.17.0.patch