ctdb-tests: Drop residual CTDB_MANAGED_<service> variables

These no longer do anything.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/eventscripts/31.clamd.monitor.002.sh b/ctdb/tests/eventscripts/31.clamd.monitor.002.sh
index 744bb92f947d65f7a9fec36fd954a8f9a9b153ca..48d3cbf189120c5a22cddf00bd91ed3c4fd91885 100755 (executable)
--- a/ctdb/tests/eventscripts/31.clamd.monitor.002.sh
+++ b/ctdb/tests/eventscripts/31.clamd.monitor.002.sh
@@ -7,7 +7,6 @@ define_test "Managed, clamd not listening"
 setup
 
 setup_script_options <<EOF
-CTDB_MANAGES_CLAMD=yes
 CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
 EOF
 

diff --git a/ctdb/tests/eventscripts/31.clamd.monitor.003.sh b/ctdb/tests/eventscripts/31.clamd.monitor.003.sh
index 34a7fe2920f6acd059cffe6e1e3a39d440e46de6..f4e37d2b7b5f2f49c73abdf09d8ec4c92adfc691 100755 (executable)
--- a/ctdb/tests/eventscripts/31.clamd.monitor.003.sh
+++ b/ctdb/tests/eventscripts/31.clamd.monitor.003.sh
@@ -7,7 +7,6 @@ define_test "Managed, clamd listening"
 setup
 
 setup_script_options <<EOF
-CTDB_MANAGES_CLAMD=yes
 CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
 EOF
 

diff --git a/ctdb/tests/eventscripts/40.vsftpd.monitor.002.sh b/ctdb/tests/eventscripts/40.vsftpd.monitor.002.sh
index be22b4ce3cfc32e067478a242a21d7f35899b1a6..4426e1b103c4af04c9cf29dcb93ae34bd4b296bc 100755 (executable)
--- a/ctdb/tests/eventscripts/40.vsftpd.monitor.002.sh
+++ b/ctdb/tests/eventscripts/40.vsftpd.monitor.002.sh
@@ -6,10 +6,6 @@ define_test "managed, down - once, twice"
 
 setup "down"
 
-setup_script_options <<EOF
-CTDB_MANAGES_VSFTPD="yes"
-EOF
-
 ok <<EOF
 vsftpd not listening on TCP port 21
 WARNING: vsftpd not listening but less than 2 consecutive failures, not unhealthy yet

diff --git a/ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh b/ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh
index 106a009daeed101554179f8fffed172401bb590d..fe6527817db66f65b3c7498d36ddad36fc74b657 100755 (executable)
--- a/ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh
+++ b/ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh
@@ -6,10 +6,6 @@ define_test "managed"
 
 setup "up"
 
-setup_script_options <<EOF
-CTDB_MANAGES_VSFTPD="yes"
-EOF
-
 ok <<EOF
 Stopping vsftpd: OK
 EOF

diff --git a/ctdb/tests/eventscripts/40.vsftpd.startup.002.sh b/ctdb/tests/eventscripts/40.vsftpd.startup.002.sh
index 4b889d11fda3062b2ad84cd1d24b372b48d91d9e..dd39860b7b46459e3cfd006eba0c9293a11a0359 100755 (executable)
--- a/ctdb/tests/eventscripts/40.vsftpd.startup.002.sh
+++ b/ctdb/tests/eventscripts/40.vsftpd.startup.002.sh
@@ -6,10 +6,6 @@ define_test "managed"
 
 setup "down"
 
-setup_script_options <<EOF
-CTDB_MANAGES_VSFTPD="yes"
-EOF
-
 ok <<EOF
 Starting vsftpd: OK
 EOF

diff --git a/ctdb/tests/eventscripts/41.httpd.monitor.002.sh b/ctdb/tests/eventscripts/41.httpd.monitor.002.sh
index c2238a5820eb3bb2d61b4a5f11062a667a561f50..383040c41586544a2211cbfe7ec0d1ed19dcbd4c 100755 (executable)
--- a/ctdb/tests/eventscripts/41.httpd.monitor.002.sh
+++ b/ctdb/tests/eventscripts/41.httpd.monitor.002.sh
@@ -6,10 +6,6 @@ define_test "managed, down - 5 times"
 
 setup "down"
 
-setup_script_options <<EOF
-CTDB_MANAGES_HTTPD="yes"
-EOF
-
 ok_null
 simple_test
 

diff --git a/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh b/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh
index 79a33a458599bcb286a89a9138f77a891b536fc5..4e342fbfaed8c5be3598e5252b6159545d469475 100755 (executable)
--- a/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh
+++ b/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh
@@ -6,10 +6,6 @@ define_test "managed"
 
 setup "up"
 
-setup_script_options <<EOF
-CTDB_MANAGES_HTTPD="yes"
-EOF
-
 ok <<EOF
 Stopping httpd: OK
 EOF

diff --git a/ctdb/tests/eventscripts/41.httpd.startup.002.sh b/ctdb/tests/eventscripts/41.httpd.startup.002.sh
index 0e5c0cf3f1f4e3171e3bf7d13511c88f45565431..1722785450a5acf4eade091aba1a1f5feb5fdf82 100755 (executable)
--- a/ctdb/tests/eventscripts/41.httpd.startup.002.sh
+++ b/ctdb/tests/eventscripts/41.httpd.startup.002.sh
@@ -6,10 +6,6 @@ define_test "managed"
 
 setup "down"
 
-setup_script_options <<EOF
-CTDB_MANAGES_HTTPD="yes"
-EOF
-
 ok <<EOF
 Starting httpd: OK
 EOF

diff --git a/ctdb/tests/eventscripts/49.winbind.shutdown.002.sh b/ctdb/tests/eventscripts/49.winbind.shutdown.002.sh
index de637759f12f96120380245dc36764af79fdf2dd..dc6f160e38bd7f7585e5d68d1555873c2849bf86 100755 (executable)
--- a/ctdb/tests/eventscripts/49.winbind.shutdown.002.sh
+++ b/ctdb/tests/eventscripts/49.winbind.shutdown.002.sh
@@ -6,10 +6,6 @@ define_test "managed"
 
 setup "up"
 
-setup_script_options <<EOF
-CTDB_MANAGES_WINBIND="yes"
-EOF
-
 ok <<EOF
 Stopping winbind: OK
 EOF

diff --git a/ctdb/tests/eventscripts/49.winbind.startup.002.sh b/ctdb/tests/eventscripts/49.winbind.startup.002.sh
index 83c83d34c245b77e40abc79792fa3ff384e94b05..dd0c1adc7034a5cb355709eb1991e11decc9acc4 100755 (executable)
--- a/ctdb/tests/eventscripts/49.winbind.startup.002.sh
+++ b/ctdb/tests/eventscripts/49.winbind.startup.002.sh
@@ -6,10 +6,6 @@ define_test "managed"
 
 setup "down"
 
-setup_script_options <<EOF
-CTDB_MANAGES_WINBIND="yes"
-EOF
-
 ok <<EOF
 Starting winbind: OK
 EOF

diff --git a/ctdb/tests/eventscripts/scripts/06.nfs.sh b/ctdb/tests/eventscripts/scripts/06.nfs.sh
index d0b748c1454ab43b566693ede104a6b5d3bdfed5..48ee4895cf0b12329e54206c2936b9693f1c24e1 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/06.nfs.sh
+++ b/ctdb/tests/eventscripts/scripts/06.nfs.sh
@@ -1,6 +1,4 @@
 setup ()
 {
-       setup_script_options "service" "60.nfs" <<EOF
-CTDB_MANAGES_NFS="yes"
-EOF
+       :
 }

diff --git a/ctdb/tests/eventscripts/scripts/31.clamd.sh b/ctdb/tests/eventscripts/scripts/31.clamd.sh
index 65767a0739747ccb41989f12168d6e37d585eeee..8fe3bbc6186eec98d8a60c7252f1f1b9aa42d8b6 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/31.clamd.sh
+++ b/ctdb/tests/eventscripts/scripts/31.clamd.sh
@@ -1,9 +1,7 @@
 setup ()
 {
        setup_script_options <<EOF
-CTDB_MANAGES_CLAMD="yes"
 CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
-
 EOF
 
        setup_unix_listen

diff --git a/ctdb/tests/eventscripts/scripts/40.vsftpd.sh b/ctdb/tests/eventscripts/scripts/40.vsftpd.sh
index 2d2300804fc16875307e7e973dd64630c2879d33..de2aa263c21885739ff5a05988ec3c36f7b4aa95 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/40.vsftpd.sh
+++ b/ctdb/tests/eventscripts/scripts/40.vsftpd.sh
@@ -9,8 +9,4 @@ setup ()
        else
                service "$_service_name" force-stopped
        fi
-
-       setup_script_options <<EOF
-CTDB_MANAGES_VSFTPD=""
-EOF
 }

diff --git a/ctdb/tests/eventscripts/scripts/41.httpd.sh b/ctdb/tests/eventscripts/scripts/41.httpd.sh
index 4061d0f606160981c9f92d1ea92c19bf71c94f64..9b4a9ad6342b7b3f3be9ebc0cea72a88ff59e120 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/41.httpd.sh
+++ b/ctdb/tests/eventscripts/scripts/41.httpd.sh
@@ -11,8 +11,4 @@ setup ()
                        service "$_service_name" force-stopped
                done
        fi
-
-       setup_script_options <<EOF
-CTDB_MANAGES_HTTPD=""
-EOF
 }

diff --git a/ctdb/tests/eventscripts/scripts/49.winbind.sh b/ctdb/tests/eventscripts/scripts/49.winbind.sh
index a626163d3b9d1c7093ac0d014cd437f02654d649..e9bbe31faf588aed9a649d0c8a1d45f0408d794a 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/49.winbind.sh
+++ b/ctdb/tests/eventscripts/scripts/49.winbind.sh
@@ -8,10 +8,6 @@ setup ()
 
                service "winbind" force-started
 
-               setup_script_options <<EOF
-CTDB_MANAGES_WINBIND="yes"
-EOF
-
                export FAKE_WBINFO_FAIL="no"
 
        else
@@ -19,10 +15,6 @@ EOF
 
                service "winbind" force-stopped
 
-               setup_script_options <<EOF
-CTDB_MANAGES_WINBIND=""
-EOF
-
                export FAKE_WBINFO_FAIL="yes"
        fi
 }

diff --git a/ctdb/tests/eventscripts/scripts/50.samba.sh b/ctdb/tests/eventscripts/scripts/50.samba.sh
index ce5c0a372ad8f8746d713782a1b5fbe6be9e5c52..3ffe18a201e69485c5c378919b9e0aba3a05c66d 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/50.samba.sh
+++ b/ctdb/tests/eventscripts/scripts/50.samba.sh
@@ -11,10 +11,6 @@ setup ()
                        service "$i" force-started
                done
 
-               setup_script_options <<EOF
-CTDB_MANAGES_SAMBA="yes"
-EOF
-
                setup_tcp_listen 445 139
 
                # Some things in 50.samba are backgrounded and waited
@@ -29,10 +25,6 @@ EOF
                        service "$i" force-stopped
                done
 
-               setup_script_options <<EOF
-CTDB_MANAGES_SAMBA=""
-EOF
-
                setup_tcp_listen
        fi
 

diff --git a/ctdb/tests/eventscripts/scripts/60.nfs.sh b/ctdb/tests/eventscripts/scripts/60.nfs.sh
index 3c740a1f43a82f9c4b96efe0d5cf366505bc39e4..15670e76910663750bfac85163cac8dc77816a3c 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/60.nfs.sh
+++ b/ctdb/tests/eventscripts/scripts/60.nfs.sh
@@ -23,10 +23,6 @@ EOF
                service "nfs" force-started
                service "nfslock" force-started
 
-               setup_script_options <<EOF
-CTDB_MANAGES_NFS="yes"
-EOF
-
                rpc_services_up \
                        "portmapper" "nfs" "mountd" "rquotad" \
                        "nlockmgr" "status"
@@ -40,10 +36,6 @@ EOF
 
                service "nfs" force-stopped
                service "nfslock" force-stopped
-
-               setup_script_options <<EOF
-CTDB_MANAGES_NFS=""
-EOF
        fi
 
        # This is really nasty.  However, when we test NFS we don't