Просмотр исходного кода

drop last references to compatibility: whitetank

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Angus Salkeld <asalkeld@redhat.com>
Fabio M. Di Nitto 14 лет назад
Родитель
Сommit
a6ffed0a52

+ 0 - 2
conf/corosync.conf.example

@@ -1,6 +1,4 @@
 # Please read the corosync.conf.5 manual page
-compatibility: whitetank
-
 totem {
 	version: 2
 

+ 0 - 2
conf/corosync.conf.example.udpu

@@ -1,6 +1,4 @@
 # Please read the corosync.conf.5 manual page
-compatibility: whitetank
-
 totem {
 	version: 2
 	secauth: off

+ 1 - 1
conf/corosync.xml.example

@@ -4,7 +4,7 @@
     Please read the corosync.xml.5 and corosync.conf.5 manual page
 -->
 
-<corosync compatibility="whitetank">
+<corosync>
 
 <!--
     totem tag configures behavior of totem and interfaces.

+ 1 - 5
conf/lenses/corosync.aug

@@ -34,10 +34,6 @@ let qstr (k:regexp) =
   [ ikey k . wsc . bare . eol ]
  |[ ikey k . wsc . quoted . eol ]
 
-(* The compatibility option *)
-let compatibility = kv "compatibility" /whitetank|none/
-
-
 (* A integer subsection *)
 let interface =
   let setting =
@@ -165,6 +161,6 @@ let uidgid =
    qstr /uid|gid/ in
   section "uidgid" setting
 
-let lns = (comment|empty|compatibility|totem|quorum|logging|resources|service|uidgid)*
+let lns = (comment|empty|totem|quorum|logging|resources|service|uidgid)*
 
 let xfm = transform lns (incl "/etc/corosync/corosync.conf")

+ 0 - 2
conf/lenses/tests/test_corosync.aug

@@ -1,7 +1,6 @@
 module Test_corosync =
 
   let conf = "# Please read the corosync.conf.5 manual page
-compatibility: whitetank
 
 totem {
 	version: 2
@@ -77,7 +76,6 @@ uidgid {
 test Corosync.lns get conf =
 
   { "#comment" = "Please read the corosync.conf.5 manual page" }
-  { "compatibility" = "whitetank" }
   { }
   { "totem"
 	{ "version" = "2" }

+ 0 - 3
cts/corotests.py

@@ -225,7 +225,6 @@ class CpgCfgChgOnLowestNodeJoin(CTSTest):
         self.stop = StopTest(cm)
         self.config = {}
         self.need_all_up = False
-        self.config['compatibility'] = 'none'
 
     def config_valid(self, config):
         return True
@@ -1544,13 +1543,11 @@ def CoroTestList(cm, audits):
     configs.append(default)
 
     a = ConfigContainer('none_5min')
-    a['compatibility'] = 'none'
     a['totem/token'] = (5 * 60 * 1000)
     a['totem/consensus'] = int(5 * 60 * 1000 * 1.2) + 1
     configs.append(a)
 
     b = ConfigContainer('pcmk_basic')
-    b['compatibility'] = 'whitetank'
     b['totem/token'] = 5000
     b['totem/token_retransmits_before_loss_const'] = 10
     b['totem/join'] = 1000