ctdb-script: Drop CTDB_MANAGED_SERVICES configuration option

This seems never to have caught on so reduce complexity.

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

diff --git a/ctdb/config/events.d/06.nfs b/ctdb/config/events.d/06.nfs
index 833ae39a094ba24805a7b3880563d6893baaf7ea..81915aba9400d78c7a52e7f1dc6e692eb212c940 100755 (executable)
--- a/ctdb/config/events.d/06.nfs
+++ b/ctdb/config/events.d/06.nfs
@@ -28,7 +28,7 @@ nfs_callout_pre ()
 # shellcheck disable=SC2154
 nfs_callout_init "$script_state_dir"
 
-is_ctdb_managed_service || exit 0
+[ "$CTDB_MANAGES_NFS" = "yes" ] || exit 0
 
 case "$1" in
 takeip)

diff --git a/ctdb/config/events.d/31.clamd b/ctdb/config/events.d/31.clamd
index 1b7636541ae073249896073ad4db5fd1a816ab79..86d12a701343c8617a9649c3f5c31085ccd069b9 100755 (executable)
--- a/ctdb/config/events.d/31.clamd
+++ b/ctdb/config/events.d/31.clamd
@@ -25,7 +25,7 @@ esac
 
 loadconfig
 
-is_ctdb_managed_service || exit 0
+[ "$CTDB_MANAGES_CLAMD" = "yes" ] || exit 0
 
 case "$1" in
 startup)

diff --git a/ctdb/config/events.d/40.vsftpd b/ctdb/config/events.d/40.vsftpd
index 95de406e0031b3a6dad86c54cb4c5226d3289651..977bbc754ee4838096fc989404b70e750ff3dae5 100755 (executable)
--- a/ctdb/config/events.d/40.vsftpd
+++ b/ctdb/config/events.d/40.vsftpd
@@ -17,7 +17,7 @@ loadconfig
 
 ctdb_setup_state_dir "service" "$service_name"
 
-is_ctdb_managed_service || exit 0
+[ "$CTDB_MANAGES_VSFTPD" = "yes" ] || exit 0
 
 case "$1" in
 startup)

diff --git a/ctdb/config/events.d/41.httpd b/ctdb/config/events.d/41.httpd
index adba39721347cd0581817708ab8a5875ba5efa86..66f3ec53f74d4869f0b7955bd674e87d50570715 100755 (executable)
--- a/ctdb/config/events.d/41.httpd
+++ b/ctdb/config/events.d/41.httpd
@@ -49,7 +49,7 @@ service_stop ()
 
 loadconfig
 
-is_ctdb_managed_service || exit 0
+[ "$CTDB_MANAGES_HTTPD" = "yes" ] || exit 0
 
 case "$1" in
 startup)

diff --git a/ctdb/config/events.d/49.winbind b/ctdb/config/events.d/49.winbind
index 5e937378295cabf32c615e2e2a0b3b5a716806ef..d5f036da9ee2a83ffd0d87a15ea01992ee3a4a68 100755 (executable)
--- a/ctdb/config/events.d/49.winbind
+++ b/ctdb/config/events.d/49.winbind
@@ -34,7 +34,7 @@ service_stop ()
 
 ###########################
 
-is_ctdb_managed_service || exit 0
+[ "$CTDB_MANAGES_WINBIND" = "yes" ] || exit 0
 
 ###########################
 

diff --git a/ctdb/config/events.d/50.samba b/ctdb/config/events.d/50.samba
index ca987be3393700f2af11cd070ca09a5ea546271a..286354fa7b8d1fe2b2309706045bf632929cb21a 100755 (executable)
--- a/ctdb/config/events.d/50.samba
+++ b/ctdb/config/events.d/50.samba
@@ -149,7 +149,7 @@ list_samba_ports ()
 
 ###########################
 
-is_ctdb_managed_service || exit 0
+[ "$CTDB_MANAGES_SAMBA" = "yes" ] || exit 0
 
 ###########################
 

diff --git a/ctdb/config/events.d/60.nfs b/ctdb/config/events.d/60.nfs
index f630a3d861ef080866f33489392a018be45d8531..ee048e2197532ae12d559d5724aad4a4c71f62da 100755 (executable)
--- a/ctdb/config/events.d/60.nfs
+++ b/ctdb/config/events.d/60.nfs
@@ -251,7 +251,7 @@ nfs_update_lock_info ()
 # shellcheck disable=SC2154
 nfs_callout_init "$script_state_dir"
 
-is_ctdb_managed_service || exit 0
+[ "$CTDB_MANAGES_NFS" = "yes" ] || exit 0
 
 case "$1" in
 startup)

diff --git a/ctdb/config/events.d/70.iscsi b/ctdb/config/events.d/70.iscsi
index 8851c594467f18432b4eda3b4a7e5a5f2b13e20f..8048be0d1baed2eeef80c98546272f07656a5aa6 100755 (executable)
--- a/ctdb/config/events.d/70.iscsi
+++ b/ctdb/config/events.d/70.iscsi
@@ -13,7 +13,7 @@ service_name="iscsi"
 
 loadconfig
 
-is_ctdb_managed_service || exit 0
+[ "$CTDB_MANAGES_ISCSI" = "yes" ] || exit 0
 
 [ -z "$CTDB_START_ISCSI_SCRIPTS" ] && {
        echo "No iscsi start script directory found"

diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index ee9cec84759f9e9d0356a94aa37ce43c48b08a18..ac5214238ce2482f7981c783c92e69a267be8ac0 100644 (file)
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -1398,31 +1398,6 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
       </variablelist>
     </refsect2>
 
-    <refsect2>
-      <title>MISCELLANEOUS SERVICE-RELATED CONFIGURATION</title>
-
-      <variablelist>
-
-       <varlistentry>
-         <term>CTDB_MANAGED_SERVICES=<parameter>SERVICE-LIST</parameter></term>
-         <listitem>
-           <para>
-             SERVICE-LIST is a space-separated list of SERVICEs that
-             CTDB should manage.  This can be used as an alternative
-             to the
-             <varname>CTDB_MANAGES_<replaceable>SERVICE</replaceable></varname>
-             variables.
-           </para>
-           <para>
-             No default.
-           </para>
-         </listitem>
-       </varlistentry>
-
-      </variablelist>
-
-    </refsect2>
-
   </refsect1>
 
   <refsect1>

diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index c69668070c34812a1b25d76edfd8bb91667a0a3f..dc0c0d265fa204548a24d4d056734799e704caf7 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -816,7 +816,7 @@ setup_samba ()
        done
 
        export CTDB_SAMBA_SKIP_SHARE_CHECK="no"
-       export CTDB_MANAGED_SERVICES="foo samba bar"
+       export CTDB_MANAGES_SAMBA="yes"
 
        export FAKE_TCP_LISTEN="0.0.0.0:445 0.0.0.0:139"
        export FAKE_WBINFO_FAIL="no"
@@ -834,8 +834,7 @@ setup_samba ()
        done
 
        export CTDB_SAMBA_SKIP_SHARE_CHECK="no"
-       export CTDB_MANAGED_SERVICES="foo bar"
-       unset CTDB_MANAGES_SAMBA
+       export CTDB_MANAGES_SAMBA=""
 
        export FAKE_TCP_LISTEN=""
        export FAKE_WBINFO_FAIL="yes"
@@ -871,7 +870,7 @@ setup_winbind ()
 
        service "winbind" force-started
 
-       export CTDB_MANAGED_SERVICES="foo winbind bar"
+       export CTDB_MANAGES_WINBIND="yes"
 
        export FAKE_WBINFO_FAIL="no"
 
@@ -880,8 +879,7 @@ setup_winbind ()
 
        service "winbind" force-stopped
 
-       export CTDB_MANAGED_SERVICES="foo bar"
-       unset CTDB_MANAGES_WINBIND
+       export CTDB_MANAGES_WINBIND=""
 
        export FAKE_WBINFO_FAIL="yes"
     fi
@@ -921,7 +919,7 @@ setup_nfs ()
        service "nfs" force-started
        service "nfslock" force-started
 
-       export CTDB_MANAGED_SERVICES="foo nfs bar"
+       export CTDB_MANAGES_NFS="yes"
 
        rpc_services_up \
            "portmapper" "nfs" "mountd" "rquotad" "nlockmgr" "status"
@@ -934,8 +932,7 @@ setup_nfs ()
        service "nfs" force-stopped
        service "nfslock" force-stopped
 
-       export CTDB_MANAGED_SERVICES="foo bar"
-       unset CTDB_MANAGES_NFS
+       export CTDB_MANAGES_NFS=""
     fi
 
     # This is really nasty.  However, when we test NFS we don't
@@ -1187,8 +1184,7 @@ setup_vsftpd ()
                service "$_service_name" force-stopped
        fi
 
-       export CTDB_MANAGED_SERVICES="foo"
-       unset CTDB_MANAGES_VSFTPD
+       export CTDB_MANAGES_VSFTPD=""
 }
 
 ######################################################################
@@ -1209,8 +1205,7 @@ setup_httpd ()
                done
        fi
 
-       export CTDB_MANAGED_SERVICES="foo"
-       unset CTDB_MANAGES_HTTPD
+       export CTDB_MANAGES_HTTPD=""
 }
 
 ######################################################################