Put conf directory in openais directory.

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1584 fd59a12c-fef9-0310-b244-a6a79926bd2f

diff --git a/corosync/conf/amf.conf b/corosync/conf/amf.conf
deleted file mode 100644 (file)
index ec3220b..0000000
--- a/corosync/conf/amf.conf
+++ /dev/null
@@ -1,200 +0,0 @@
-# AMF Test configuration file
-# - Times in milliseconds
-# - clccli_path can be set on any level from application and down and will be
-# added to the CLI commands if they are not already specified with an absolute
-# path (begins with /).
-# WL - WorkLoad
-
-safAmfCluster = TEST_CLUSTER {
-       saAmfClusterStartupTimeout=3000
-       safAmfNode = AMF1 {
-               saAmfNodeSuFailOverProb=2000
-               saAmfNodeSuFailoverMax=2
-               saAmfNodeClmNode=p01
-       }
-       safAmfNode = AMF2 {
-               saAmfNodeSuFailOverProb=2000
-               saAmfNodeSuFailoverMax=2
-               saAmfNodeClmNode=p02
-       }
-       safApp = APP-1 {
-               safSg = RAID {
-                       saAmfSGRedundancyModel=nplusm   
-                       saAmfSGNumPrefActiveSUs=1
-                       saAmfSGMaxActiveSIsperSUs=2
-                       saAmfSGNumPrefStandbySUs=1
-                       saAmfSGMaxStandbySIsperSUs=2
-                       saAmfSGCompRestartProb=100000
-                       saAmfSGCompRestartMax=1
-                       saAmfSGSuRestartProb=20000      
-                       saAmfSGSuRestartMax=1
-                       saAmfSGAutoAdjustProb=5000
-                       safSu = SERVICE_X_1 {
-                               saAmfSUHostedByNode=AMF1
-                               saAmfSUNumComponents=1
-                               safComp = A {
-                                       saAmfCompCategory=sa_aware
-                                       saAmfCompCapability=x_active_or_y_standby
-                                       saAmfCompNumMaxActiveCsi=1
-                                       saAmfCompNumMaxStandbyCsi=1
-                                       saAmfCompDefaultClcCliTimeout = 500
-                                       saAmfCompDefaultCallbackTimeOut = 500
-                                       saAmfCompInstantiateCmd = /tmp/aistest/clc_cli_script
-                                       saAmfCompInstantiateCmdArgv= instantiate /tmp/aistest/testamf1
-                                       saAmfCompTerminateCmd = /tmp/aistest/clc_cli_script
-                                       saAmfCompTerminateCmdArgv = terminate
-                                       saAmfCompCleanupCmd = /tmp/aistest/clc_cli_script
-                                       saAmfCompCleanupCmdArgv = cleanup
-                                       saAmfCompCsTypes {
-                                               A
-                                       }
-                                       saAmfCompCmdEnv {
-                                               var1=val1
-                                               var2=val2
-                                       }
-                                       saAmfCompRecoveryOnError=component_restart
-                                       safHealthcheckKey = amfInvoked {
-                                               saAmfHealthcheckPeriod = 4000
-                                               saAmfHealthcheckMaxDuration = 350
-                                       }
-                                       safHealthcheckKey = compInvoked {
-                                               saAmfHealthcheckPeriod = 5000
-                                       }
-                               }
-                               safComp = B {
-                                       saAmfCompCategory=sa_aware
-                                       saAmfCompCapability=x_active_or_y_standby
-                                       saAmfCompNumMaxActiveCsi=1
-                                       saAmfCompNumMaxStandbyCsi=1
-                                       saAmfCompDefaultClcCliTimeout = 500
-                                       saAmfCompDefaultCallbackTimeOut = 500
-                                       saAmfCompInstantiateCmd = /tmp/aistest/clc_cli_script
-                                       saAmfCompInstantiateCmdArgv= instantiate /tmp/aistest/testamf1
-                                       saAmfCompTerminateCmd = /tmp/aistest/clc_cli_script
-                                       saAmfCompTerminateCmdArgv = terminate
-                                       saAmfCompCleanupCmd = /tmp/aistest/clc_cli_script
-                                       saAmfCompCleanupCmdArgv = cleanup
-                                       saAmfCompCsTypes {
-                                               B
-                                       }
-                                       saAmfCompCmdEnv {
-                                               var1=val1
-                                               var2=val2
-                                       }
-                                       saAmfCompRecoveryOnError=component_restart
-                                       safHealthcheckKey = amfInvoked {
-                                               saAmfHealthcheckPeriod = 4000
-                                               saAmfHealthcheckMaxDuration = 350
-                                       }
-                                       safHealthcheckKey = compInvoked {
-                                               saAmfHealthcheckPeriod = 5000
-                                       }
-                               }
-                       }
-                       safSu = SERVICE_X_2 {
-                               clccli_path=/tmp/aistest
-                               saAmfSUHostedByNode=AMF2
-                               saAmfSUNumComponents=1
-                               safComp = A {
-                                       saAmfCompCategory=sa_aware
-                                       saAmfCompCapability=x_active_or_y_standby
-                                       saAmfCompNumMaxActiveCsi=1
-                                       saAmfCompNumMaxStandbyCsi=1
-                                       saAmfCompDefaultClcCliTimeout = 500
-                                       saAmfCompDefaultCallbackTimeOut = 500
-                                       saAmfCompInstantiateCmd = clc_cli_script
-                                       saAmfCompInstantiateCmdArgv= instantiate
-                                       saAmfCompTerminateCmd = clc_cli_script
-                                       saAmfCompTerminateCmdArgv = terminate
-                                       saAmfCompCleanupCmd = clc_cli_script
-                                       saAmfCompCleanupCmdArgv = cleanup
-                                       saAmfCompCsTypes {
-                                               A
-                                       }
-                                       saAmfCompCmdEnv {
-                                               COMP_BINARY_PATH=/tmp/aistest
-                                               COMP_BINARY_NAME=testamf1
-                                               var1=val1
-                                               var2=val2
-                                       }
-                                       saAmfCompRecoveryOnError=component_restart
-                                       safHealthcheckKey = amfInvoked {
-                                               saAmfHealthcheckPeriod = 4000
-                                               saAmfHealthcheckMaxDuration = 350
-                                       }
-                                       safHealthcheckKey = compInvoked {
-                                               saAmfHealthcheckPeriod = 5000
-                                       }
-                               }
-                               safComp = B {
-                                       saAmfCompCategory=sa_aware
-                                       saAmfCompCapability=x_active_or_y_standby
-                                       saAmfCompNumMaxActiveCsi=1
-                                       saAmfCompNumMaxStandbyCsi=1
-                                       saAmfCompDefaultClcCliTimeout = 500
-                                       saAmfCompDefaultCallbackTimeOut = 500
-                                       saAmfCompInstantiateCmd = /tmp/aistest/clc_cli_script
-                                       saAmfCompInstantiateCmdArgv= instantiate /tmp/aistest/testamf1
-                                       saAmfCompTerminateCmd = /tmp/aistest/clc_cli_script
-                                       saAmfCompTerminateCmdArgv = terminate
-                                       saAmfCompCleanupCmd = /tmp/aistest/clc_cli_script
-                                       saAmfCompCleanupCmdArgv = cleanup
-                                       saAmfCompCsTypes {
-                                               B
-                                       }
-                                       saAmfCompCmdEnv {
-                                               var1=val1
-                                               var2=val2
-                                       }
-                                       saAmfCompRecoveryOnError=component_restart
-                                       safHealthcheckKey = amfInvoked {
-                                               saAmfHealthcheckPeriod = 4000
-                                               saAmfHealthcheckMaxDuration = 350
-                                       }
-                                       safHealthcheckKey = compInvoked {
-                                               saAmfHealthcheckPeriod = 5000
-                                       }
-                               }
-                       }
-               }
-               safSi = WL1 {
-                       saAmfSINumCSIs=2
-                       safCsi = WL1-1 {
-                               saAmfCSTypeName = A
-                       }
-                       safCsi = WL1-2 {
-                               saAmfCSTypeName = B
-                               safCSIAttr = attr1 {
-                                       val1
-                                       val2
-                               }
-                               safCSIAttr = good_health_limit {
-                                       100000
-                               }
-                       }
-               }
-               safSi = WL2 {
-                       saAmfSINumCSIs=2
-                       safCsi = WL2-1 {
-                               saAmfCSTypeName = A
-                       }
-                       safCsi = WL2-2 {
-                               saAmfCSTypeName = B
-                               safCSIAttr = attr1 {
-                                       val1
-                                       val2
-                               }
-                               safCSIAttr = good_health_limit {
-                                       100000
-                               }
-                       }
-               }
-               safCSType = A {
-                       safAmfCSAttrName = attr1
-                       safAmfCSAttrName = good_health_limit
-               }
-               safCSType = B {
-               }
-       }
-}
-

diff --git a/corosync/conf/amf_example.conf b/corosync/conf/amf_example.conf
deleted file mode 100644 (file)
index 18b9dbe..0000000
--- a/corosync/conf/amf_example.conf
+++ /dev/null
@@ -1,193 +0,0 @@
-# AMF Example configuration file, please read README.amf
-# - Times in milliseconds
-# - clccli_path can be set on any level from application and down and will be
-# added to the CLI commands if they are not already specified with an absolute
-# path (begins with /).
-# WL - WorkLoad
-
-safAmfCluster = TEST_CLUSTER {
-       saAmfClusterStartupTimeout=3000
-       safAmfNode = AMF1 {
-               saAmfNodeSuFailOverProb=2000
-               saAmfNodeSuFailoverMax=2
-               saAmfNodeClmNode=seasc0035
-       }
-#      safAmfNode = AMF2 {
-#              saAmfNodeSuFailOverProb=2000
-#              saAmfNodeSuFailoverMax=2
-#              saAmfNodeClmNode=p02
-#      }
-       safApp = APP-1 {
-               safSg = RAID {
-                       saAmfSGRedundancyModel=nplusm   
-                       saAmfSGNumPrefActiveSUs=1
-                       saAmfSGMaxActiveSIsperSUs=2
-                       saAmfSGNumPrefStandbySUs=1
-                       saAmfSGMaxStandbySIsperSUs=2
-                       saAmfSGCompRestartProb=100000
-                       saAmfSGCompRestartMax=2
-                       saAmfSGSuRestartProb=20000      
-                       saAmfSGSuRestartMax=3
-                       saAmfSGAutoAdjustProb=5000
-                       safSu = SERVICE_X_1 {
-                               saAmfSUHostedByNode=AMF1
-                               saAmfSUNumComponents=1
-                               safComp = A {
-                                       saAmfCompCategory=sa_aware
-                                       saAmfCompCapability=x_active_or_y_standby
-                                       saAmfCompNumMaxActiveCsi=1
-                                       saAmfCompNumMaxStandbyCsi=1
-                                       saAmfCompDefaultClcCliTimeout = 500
-                                       saAmfCompDefaultCallbackTimeOut = 500
-                                       saAmfCompInstantiateCmd = /tmp/aisexample/clc_cli_script
-                                       saAmfCompInstantiateCmdArgv= instantiate /tmp/aisexample/testamf1
-                                       saAmfCompTerminateCmd = /tmp/aisexample/clc_cli_script
-                                       saAmfCompTerminateCmdArgv = terminate
-                                       saAmfCompCleanupCmd = /tmp/aisexample/clc_cli_script
-                                       saAmfCompCleanupCmdArgv = cleanup
-                                       saAmfCompCsTypes {
-                                               A
-                                       }
-                                       saAmfCompCmdEnv {
-                                               var1=val1
-                                               var2=val2
-                                       }
-                                       saAmfCompRecoveryOnError=component_restart
-                                       safHealthcheckKey = key1 {
-                                               saAmfHealthcheckPeriod = 5000
-                                               saAmfHealthcheckMaxDuration = 350
-                                       }
-                               }
-                               safComp = B {
-                                       saAmfCompCategory=sa_aware
-                                       saAmfCompCapability=x_active_or_y_standby
-                                       saAmfCompNumMaxActiveCsi=1
-                                       saAmfCompNumMaxStandbyCsi=1
-                                       saAmfCompDefaultClcCliTimeout = 500
-                                       saAmfCompDefaultCallbackTimeOut = 500
-                                       saAmfCompInstantiateCmd = /tmp/aisexample/clc_cli_script
-                                       saAmfCompInstantiateCmdArgv= instantiate /tmp/aisexample/testamf1
-                                       saAmfCompTerminateCmd = /tmp/aisexample/clc_cli_script
-                                       saAmfCompTerminateCmdArgv = terminate
-                                       saAmfCompCleanupCmd = /tmp/aisexample/clc_cli_script
-                                       saAmfCompCleanupCmdArgv = cleanup
-                                       saAmfCompCsTypes {
-                                               B
-                                       }
-                                       saAmfCompCmdEnv {
-                                               var1=val1
-                                               var2=val2
-                                       }
-                                       saAmfCompRecoveryOnError=component_restart
-                                       safHealthcheckKey = key1 {
-                                               saAmfHealthcheckPeriod = 1000
-                                               saAmfHealthcheckMaxDuration = 350
-                                       }
-                               }
-                       }
-                       safSu = SERVICE_X_2 {
-                               clccli_path=/tmp/aisexample
-                               saAmfSUHostedByNode=AMF1
-#                              saAmfSUHostedByNode=AMF2
-                               saAmfSUNumComponents=1
-                               safComp = A {
-                                       saAmfCompCategory=sa_aware
-                                       saAmfCompCapability=x_active_or_y_standby
-                                       saAmfCompNumMaxActiveCsi=1
-                                       saAmfCompNumMaxStandbyCsi=1
-                                       saAmfCompDefaultClcCliTimeout = 500
-                                       saAmfCompDefaultCallbackTimeOut = 500
-                                       saAmfCompInstantiateCmd = clc_cli_script
-                                       saAmfCompInstantiateCmdArgv= instantiate
-                                       saAmfCompTerminateCmd = clc_cli_script
-                                       saAmfCompTerminateCmdArgv = terminate
-                                       saAmfCompCleanupCmd = clc_cli_script
-                                       saAmfCompCleanupCmdArgv = cleanup
-                                       saAmfCompCsTypes {
-                                               A
-                                       }
-                                       saAmfCompCmdEnv {
-                                               COMP_BINARY_PATH=/tmp/aisexample
-                                               COMP_BINARY_NAME=testamf1
-                                               var1=val1
-                                               var2=val2
-                                       }
-                                       saAmfCompRecoveryOnError=component_restart
-                                       safHealthcheckKey = key1 {
-                                               saAmfHealthcheckPeriod = 5000
-                                               saAmfHealthcheckMaxDuration = 350
-                                       }
-                                       safHealthcheckKey = key2 {
-                                               saAmfHealthcheckPeriod = 3000
-                                               saAmfHealthcheckMaxDuration = 350
-                                       }
-                               }
-                               safComp = B {
-                                       saAmfCompCategory=sa_aware
-                                       saAmfCompCapability=x_active_or_y_standby
-                                       saAmfCompNumMaxActiveCsi=1
-                                       saAmfCompNumMaxStandbyCsi=1
-                                       saAmfCompDefaultClcCliTimeout = 500
-                                       saAmfCompDefaultCallbackTimeOut = 500
-                                       saAmfCompInstantiateCmd = /tmp/aisexample/clc_cli_script
-                                       saAmfCompInstantiateCmdArgv= instantiate /tmp/aisexample/testamf1
-                                       saAmfCompTerminateCmd = /tmp/aisexample/clc_cli_script
-                                       saAmfCompTerminateCmdArgv = terminate
-                                       saAmfCompCleanupCmd = /tmp/aisexample/clc_cli_script
-                                       saAmfCompCleanupCmdArgv = cleanup
-                                       saAmfCompCsTypes {
-                                               B
-                                       }
-                                       saAmfCompCmdEnv {
-                                               var1=val1
-                                               var2=val2
-                                       }
-                                       saAmfCompRecoveryOnError=component_restart
-                                       safHealthcheckKey = key1 {
-                                               saAmfHealthcheckPeriod = 5000
-                                               saAmfHealthcheckMaxDuration = 350
-                                       }
-                               }
-                       }
-               }
-               safSi = WL1 {
-                       saAmfSINumCSIs=2
-                       safCsi = WL1-1 {
-                               saAmfCSTypeName = A
-                       }
-                       safCsi = WL1-2 {
-                               saAmfCSTypeName = B
-                               safCSIAttr = attr1 {
-                                       val1
-                                       val2
-                               }
-                               safCSIAttr = good_health_limit {
-                                       10
-                               }
-                       }
-               }
-               safSi = WL2 {
-                       saAmfSINumCSIs=2
-                       safCsi = WL2-1 {
-                               saAmfCSTypeName = A
-                       }
-                       safCsi = WL2-2 {
-                               saAmfCSTypeName = B
-                               safCSIAttr = attr1 {
-                                       val1
-                                       val2
-                               }
-                               safCSIAttr = good_health_limit {
-                                       10
-                               }
-                       }
-               }
-               safCSType = A {
-                       safAmfCSAttrName = attr1
-                       safAmfCSAttrName = good_health_limit
-               }
-               safCSType = B {
-               }
-       }
-}
-

diff --git a/corosync/conf/openais.conf b/corosync/conf/openais.conf
deleted file mode 100644 (file)
index f32bc66..0000000
--- a/corosync/conf/openais.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# Please read the openais.conf.5 manual page
-
-totem {
-       version: 2
-       secauth: off
-       threads: 0
-       interface {
-               ringnumber: 0
-               bindnetaddr: 192.168.2.0
-               mcastaddr: 226.94.1.1
-               mcastport: 5405
-       }
-}
-
-logging {
-       fileline: off
-       to_stderr: yes
-       to_file: yes
-       logfile: /tmp/openais.log
-       debug: off
-       timestamp: on
-       logger_subsys {
-               subsys: AMF
-               debug: off
-               tags: enter|leave|trace1|trace2|trace3|trace4|trace6
-       }
-}
-
-amf {
-       mode: disabled
-}

diff --git a/corosync/conf/openais_amf_example.conf b/corosync/conf/openais_amf_example.conf
deleted file mode 100644 (file)
index 8383699..0000000
--- a/corosync/conf/openais_amf_example.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-# Please read the openais.conf.5 manual page
-
-totem {
-       version: 2
-       secauth: off
-       threads: 0
-       interface {
-               ringnumber: 0
-               bindnetaddr: 127.0.0.0
-               mcastaddr: 226.94.1.1
-               mcastport: 5405
-       }
-}
-
-logging {
-       fileline: off
-       to_stderr: yes
-       to_file: yes
-       logfile: /tmp/openais.log
-       debug: off
-       timestamp: on
-       logger {
-               ident: AMF
-               debug: off
-               tags: enter|leave|trace1|trace2|trace3|trace4|trace6
-       }
-}
-
-amf {
-       mode: enabled
-}
-
-aisexec {
-    user: nisse
-    group: users
-}