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>

17 files changed, 1 insertions, 71 deletions

diff --git a/ctdb/tests/eventscripts/31.clamd.monitor.002.sh b/ctdb/tests/eventscripts/31.clamd.monitor.002.sh
index 744bb92f947..48d3cbf1891 100755
--- 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 34a7fe2920f..f4e37d2b7b5 100755
--- 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 be22b4ce3cf..4426e1b103c 100755
--- 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 106a009daee..fe6527817db 100755
--- 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 4b889d11fda..dd39860b7b4 100755
--- 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 c2238a5820e..383040c4158 100755
--- 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 79a33a45859..4e342fbfaed 100755
--- 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 0e5c0cf3f1f..1722785450a 100755
--- 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 de637759f12..dc6f160e38b 100755
--- 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 83c83d34c24..dd0c1adc703 100755
--- 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 d0b748c1454..48ee4895cf0 100644
--- 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 65767a07397..8fe3bbc6186 100644
--- 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 2d2300804fc..de2aa263c21 100644
--- 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 4061d0f6061..9b4a9ad6342 100644
--- 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 a626163d3b9..e9bbe31faf5 100644
--- 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 ce5c0a372ad..3ffe18a201e 100644
--- 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 3c740a1f43a..15670e76910 100644
--- 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