ctdb: Drop configuration file ctdbd.conf
authorMartin Schwenke <martin@meltin.net>
Tue, 24 Apr 2018 05:55:11 +0000 (15:55 +1000)
committerAmitay Isaacs <amitay@samba.org>
Thu, 17 May 2018 05:03:04 +0000 (07:03 +0200)
Drop function loadconfig(), replacing uses with "load_system_config
ctdb".  Drop translation of old-style configuration to new
configuration file.  Drop export of debugging variables.  Drop
documentation and configuration examples.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Thu May 17 07:03:04 CEST 2018 on sn-devel-144

14 files changed:
ctdb/config/ctdbd.conf [deleted file]
ctdb/config/ctdbd_wrapper
ctdb/config/functions
ctdb/doc/ctdb-script.options.5.xml
ctdb/doc/ctdb-tunables.7.xml
ctdb/doc/ctdb.7.xml
ctdb/doc/ctdbd.conf.5.xml [deleted file]
ctdb/doc/ctdbd_wrapper.1.xml
ctdb/doc/examples/README
ctdb/doc/examples/cluster.conf [deleted file]
ctdb/doc/examples/lvs.conf [deleted file]
ctdb/doc/examples/natgw.conf [deleted file]
ctdb/packaging/RPM/ctdb.spec.in
ctdb/wscript

diff --git a/ctdb/config/ctdbd.conf b/ctdb/config/ctdbd.conf
deleted file mode 100644 (file)
index 57cb349..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# Options to ctdbd, read by ctdbd_wrapper(1)
-#
-# See ctdbd.conf(5) for more information about CTDB configuration variables.
-
-# Shared recovery lock file to avoid split brain.  No default.
-#
-# Do NOT run CTDB without a recovery lock file unless you know exactly
-# what you are doing.
-# CTDB_RECOVERY_LOCK=/some/place/on/shared/storage
-
-# What services should CTDB manage?  Default is none.
-# CTDB_MANAGES_SAMBA=yes
-# CTDB_MANAGES_WINBIND=yes
-# CTDB_MANAGES_NFS=yes
-
-# Default is to use the log file below instead of syslog.
-# CTDB_LOGGING=file:/var/log/log.ctdb
-
-# Default log level is NOTICE.  Want less logging?
-# CTDB_DEBUGLEVEL=ERR
index a3c9db3ea8fbcae2363befbabbaf5402ebc02328..34827eaaa29c6c7379e01eea8353523fa31c93eb 100755 (executable)
@@ -20,103 +20,14 @@ fi
 
 . "${CTDB_BASE}/functions"
 
-loadconfig
+load_system_config "ctdb"
 
 ctdbd="${CTDBD:-/usr/local/sbin/ctdbd}"
 
 ############################################################
 
-# Only the nested function references its arguments
-# shellcheck disable=SC2120
-build_ctdb_options ()
-{
-       maybe_set ()
-       {
-               _section="$1"
-               _key="$2"
-               _val="$3"
-               _check="$4"
-
-               # If the given variable isn't set then do nothing
-               [ -n "$_val" ] || return
-               # If a value is required for the variable and it doesn't
-               # match, then do nothing
-               if [ -n "$_check" -a "$_check" != "$_val" ] ; then
-                       return
-               fi
-
-               # Configuration file handling needs true/false, not yes/no
-               case "$_val" in
-               yes) _val="true"  ;;
-               no)  _val="false" ;;
-               esac
-
-               if grep -q "^\\[${_section}\\]\\$" "$_conf_file" ; then
-                       # Section already exists...
-                       # Must escape leading TAB or sed eats it
-                       sed -i -e "/\\[${_section}\\]/a\
-\\     ${_key} = ${_val}
-" "${_conf_file}"
-               else
-                       # Section does not exist and needs to be created...
-                       # Note literal TAB for indentation in here document
-                       cat >>"${_conf_file}" <<EOF
-
-[${_section}]
-       ${_key} = ${_val}
-EOF
-               fi
-       }
-
-       # Only write a new style configuration file if it doesn't already
-       # exist
-       _conf_file="${CTDB_BASE}/ctdb.conf"
-       if [ -f "$_conf_file" ] ; then
-               return
-       fi
-
-       touch "$_conf_file"
-
-       # Create configuration file from old style options
-       maybe_set "cluster" "recovery lock"      "$CTDB_RECOVERY_LOCK"
-       maybe_set "logging" "location"           "$CTDB_LOGGING"
-       maybe_set "cluster" "node address"       "$CTDB_NODE_ADDRESS"
-       maybe_set "database" "volatile database directory" \
-                 "$CTDB_DBDIR"
-       maybe_set "database" "persistent database directory" \
-                 "$CTDB_DBDIR_PERSISTENT"
-       maybe_set "database" "state database directory" \
-                 "$CTDB_DBDIR_STATE"
-       maybe_set "cluster" "transport"          "$CTDB_TRANSPORT"
-       maybe_set "logging" "log level"          "$CTDB_DEBUGLEVEL"
-       maybe_set "legacy" "start as disabled"   "$CTDB_START_AS_DISABLED" "yes"
-       maybe_set "legacy" "start as stopped"   "$CTDB_START_AS_STOPPED" "yes"
-       maybe_set "legacy" "recmaster capability" \
-                 "$CTDB_CAPABILITY_RECMASTER" "no"
-       maybe_set "legacy" "lmaster capability" \
-                 "$CTDB_CAPABILITY_LMASTER"   "no"
-       maybe_set "legacy" "no realtime"         "$CTDB_NOSETSCHED" "yes"
-       maybe_set "legacy" "script log level"    "$CTDB_SCRIPT_LOG_LEVEL"
-       maybe_set "database" "volatile uses tmpfs" \
-                 "$CTDB_DBDIR_USES_TMPFS" "yes"
-}
-
-export_debug_variables ()
-{
-    [ -n "$CTDB_DEBUG_HUNG_SCRIPT" ] && export CTDB_DEBUG_HUNG_SCRIPT
-    [ -n "$CTDB_DEBUG_LOCKS" ] && export CTDB_DEBUG_LOCKS
-}
-
-############################################################
-
 start()
 {
-    # build_ctdb_options() takes no arguments
-    # shellcheck disable=SC2119
-    build_ctdb_options
-
-    export_debug_variables
-
     eval "$ctdbd" || return 1
 
     # Wait until ctdbd has started and is ready to respond to clients.
index 649b367d4cb974f875af75f2f8a690ee4f28f95a..30afcdec9623eb23a27073756612cf48f33870cc 100755 (executable)
@@ -44,16 +44,6 @@ load_system_config ()
        fi
 }
 
-loadconfig() {
-
-       load_system_config "ctdb"
-
-       _config="${CTDB_BASE}/ctdbd.conf"
-       if [ -r "$_config" ] ; then
-               . "$_config"
-       fi
-}
-
 # load_script_options [ component script ]
 #   script is an event script name relative to a component
 #   component is currently ignored
@@ -67,8 +57,6 @@ load_script_options ()
                die "usage: load_script_options [ component script ]"
        fi
 
-       loadconfig
-
        _options="${CTDB_BASE}/script.options"
 
        if [ -r "$_options" ] ; then
index ad7f352f5c73987c5e192da446a93b3217e435df..22c5aa03c5b0ec5455063df124e0b7264e0f5364 100644 (file)
 
     </variablelist>
 
-    <para>
-      For short-term backward compatibility the CTDB configuration
-      file (see
-      <citerefentry><refentrytitle>ctdbd.conf</refentrytitle>
-      <manvolnum>5</manvolnum></citerefentry>) is also loaded.
-    </para>
-
     <para>
       These files should include simple shell-style variable
       assignments and shell-style comments.
index 317add4b63a103707f5edf412577a39b241067cf..75a3b01c14dbbca984ac23653f3bf79654912d98 100644 (file)
@@ -781,9 +781,6 @@ MonitorInterval=20
       <citerefentry><refentrytitle>ctdb.conf</refentrytitle>
       <manvolnum>5</manvolnum></citerefentry>,
 
-      <citerefentry><refentrytitle>ctdbd.conf</refentrytitle>
-      <manvolnum>5</manvolnum></citerefentry>,
-
       <citerefentry><refentrytitle>ctdb</refentrytitle>
       <manvolnum>7</manvolnum></citerefentry>,
 
index eb283a834c3dc22e5fd26acd12ffdb9a81e809cb..6902e574eae1ca4244f57945ccd2f86236ef49eb 100644 (file)
@@ -1079,9 +1079,6 @@ CTDB_CAPABILITY_RECMASTER=no
       <citerefentry><refentrytitle>ctdb.conf</refentrytitle>
       <manvolnum>5</manvolnum></citerefentry>,
 
-      <citerefentry><refentrytitle>ctdbd.conf</refentrytitle>
-      <manvolnum>5</manvolnum></citerefentry>,
-
       <citerefentry><refentrytitle>ctdb-script.options</refentrytitle>
       <manvolnum>5</manvolnum></citerefentry>,
 
diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
deleted file mode 100644 (file)
index 624a84f..0000000
+++ /dev/null
@@ -1,401 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry
-       PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-       "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<refentry id="ctdbd.conf.5">
-
-  <refmeta>
-    <refentrytitle>ctdbd.conf</refentrytitle>
-    <manvolnum>5</manvolnum>
-    <refmiscinfo class="source">ctdb</refmiscinfo>
-    <refmiscinfo class="manual">CTDB - clustered TDB database</refmiscinfo>
-  </refmeta>
-
-  <refnamediv>
-    <refname>ctdbd.conf</refname>
-    <refpurpose>CTDB daemon configuration file</refpurpose>
-  </refnamediv>
-
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>
-      This file contains CTDB configuration variables that are affect
-      the operation of CTDB.  The default location of this file is
-      <filename>/usr/local/etc/ctdb/ctdbd.conf</filename>.
-    </para>
-
-    <para>
-      This file is a shell script (see
-      <citerefentry><refentrytitle>sh</refentrytitle>
-      <manvolnum>1</manvolnum></citerefentry>) but is usually limited
-      to simple variable assignments and shell-style comments.
-    </para>
-
-    <para>
-      CTDB configuration variables are grouped into several categories below.
-    </para>
-
-    <para>
-      Variables defined in this document can also be set in a
-      distribution-specific configuration file such as
-      <filename>/etc/sysconfig/ctdb</filename> (Red Hat) or
-      <filename>/etc/default/ctdb</filename> (Debian).  However, these
-      files should be reserved for variables used by the initscript.
-      A historical alternative is
-      <filename>/usr/local/etc/ctdb/sysconfig/ctdb</filename> - this is
-      deprecated.
-    </para>
-
-  </refsect1>
-
-  <refsect1>
-    <title>
-      DAEMON CONFIGURATION
-    </title>
-
-    <para>
-      Variables in this section are processed by
-      <citerefentry><refentrytitle>ctdbd_wrapper</refentrytitle>
-      <manvolnum>1</manvolnum></citerefentry> and are converted into
-      command-line arguments to
-      <citerefentry><refentrytitle>ctdbd</refentrytitle>
-      <manvolnum>1</manvolnum></citerefentry>.
-    </para>
-
-    <para>
-      Many of these variables are also used by event scripts.
-    </para>
-
-    <variablelist>
-
-      <varlistentry>
-       <term>CTDB_CAPABILITY_LMASTER=yes|no</term>
-       <listitem>
-         <para>
-           Defaults to yes.
-         </para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term>CTDB_CAPABILITY_RECMASTER=yes|no</term>
-       <listitem>
-         <para>
-           Defaults to yes.
-         </para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term>CTDB_DBDIR=<parameter>DIRECTORY</parameter></term>
-       <listitem>
-         <para>
-           Defaults to <filename>/usr/local/var/lib/ctdb/volatile</filename>.
-         </para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term>CTDB_DBDIR_PERSISTENT=<parameter>DIRECTORY</parameter></term>
-       <listitem>
-         <para>
-           Defaults to <filename>/usr/local/var/lib/ctdb/persistent</filename>.
-         </para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term>CTDB_DBDIR_STATE=<parameter>DIRECTORY</parameter></term>
-       <listitem>
-         <para>
-           Defaults to <filename>/usr/local/var/lib/ctdb/state</filename>.
-         </para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term>CTDB_DEBUG_HUNG_SCRIPT=<parameter>FILENAME</parameter></term>
-       <listitem>
-         <para>
-           FILENAME is a script to run to log debug information when
-           an event script times out.
-         </para>
-         <para>
-           Default is <filename>/usr/local/etc/ctdb/debug-hung-script.sh</filename>.
-         </para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term>CTDB_DEBUG_LOCKS=<parameter>FILENAME</parameter></term>
-       <listitem>
-         <para>
-           FILENAME is a script to run to log debug information when
-           an CTDB fails to freeze databases during recovery.
-         </para>
-         <para>
-           No default, usually
-           <filename>/usr/local/etc/ctdb/debug_locks.sh</filename>.
-         </para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term>CTDB_DEBUGLEVEL=<parameter>DEBUGLEVEL</parameter></term>
-       <listitem>
-         <para>
-           Default is NOTICE.
-         </para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term>CTDB_LOGGING=<parameter>STRING</parameter></term>
-       <listitem>
-         <para>
-           STRING specifies where ctdbd will write its log. The
-           default is
-           file:<filename>/usr/local/var/log/log.ctdb</filename>.
-         </para>
-         <para>
-           Valid values are:
-         </para>
-         <variablelist>
-           <varlistentry>
-             <term>file:<parameter>FILENAME</parameter></term>
-             <listitem>
-               <para>
-                 FILENAME where ctdbd will write its log. This is usually
-                 <filename>/usr/local/var/log/log.ctdb</filename>.
-               </para>
-             </listitem>
-           </varlistentry>
-           <varlistentry>
-             <term>syslog<optional>:<parameter>METHOD</parameter></optional></term>
-              <listitem>
-                <para>
-                 CTDB will log to syslog.  By default this will use
-                 the syslog(3) API.
-                </para>
-               <para>
-                 If METHOD is specified then it specifies an
-                 extension that causes logging to be done in a
-                 non-blocking fashion.  This can be useful under
-                 heavy loads that might cause the syslog daemon to
-                 dequeue messages too slowly, which would otherwise
-                 cause CTDB to block when logging.  METHOD must be
-                 one of:
-               </para>
-               <variablelist>
-                 <varlistentry>
-                   <term>nonblocking</term>
-                   <listitem>
-                     <para>
-                       CTDB will log to syslog via
-                       <filename>/dev/log</filename> in non-blocking
-                       mode.
-                     </para>
-                   </listitem>
-                 </varlistentry>
-                 <varlistentry>
-                   <term>udp</term>
-                   <listitem>
-                     <para>
-                       CTDB will log to syslog via UDP to
-                       localhost:514.  The syslog daemon must be
-                       configured to listen on (at least)
-                       localhost:514.  Most implementations will log
-                       the messages against hostname "localhost" -
-                       this is a limit of the implementation for
-                       compatibility with more syslog daemon
-                       implementations.
-                     </para>
-                   </listitem>
-                 </varlistentry>
-                 <varlistentry>
-                   <term>udp-rfc5424</term>
-                   <listitem>
-                     <para>
-                       As with "udp" but messages are sent in RFC5424
-                       format.  This method will log the correct
-                       hostname but is not as widely implemented in
-                       syslog daemons.
-                     </para>
-                   </listitem>
-                 </varlistentry>
-               </variablelist>
-             </listitem>
-           </varlistentry>
-         </variablelist>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term>CTDB_NOSETSCHED=yes|no</term>
-       <listitem>
-         <para>
-           Defaults to no.
-         </para>
-         <para>
-           Usually CTDB runs with real-time priority.  If you are running
-           CTDB on a platform that does not support real-time priority,
-           you can set this.
-         </para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term>CTDB_NODE_ADDRESS=<parameter>IPADDR</parameter></term>
-       <listitem>
-         <para>
-           IPADDR is the private IP address that ctdbd will bind to.
-         </para>
-         <para>
-           By default ctdbd will select the first address from the
-           nodes list that in can bind to.  See also the
-           <citetitle>Private address</citetitle> section in
-           <citerefentry><refentrytitle>ctdb</refentrytitle>
-           <manvolnum>7</manvolnum></citerefentry>.
-         </para>
-         <para>
-           This option is only required when automatic address
-           detection can not be used.  This can be the case when
-           running multiple ctdbd daemons/nodes on the same physical
-           host (usually for testing), using InfiniBand for the
-           private network or on Linux when sysctl
-           net.ipv4.ip_nonlocal_bind=1.
-         </para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term>CTDB_RECOVERY_LOCK=<parameter>LOCK</parameter></term>
-       <listitem>
-         <para>
-           LOCK specifies the cluster-wide mutex used to detect and
-           prevent a partitioned cluster (or "split brain").
-         </para>
-         <para>
-           No default, but the default configuration file specifies
-           <filename>/some/place/on/shared/storage</filename>, which
-           should be change to a useful value.
-         </para>
-         <para>
-           For information about the recovery lock please see the
-           <citetitle>RECOVERY LOCK</citetitle> section in
-           <citerefentry><refentrytitle>ctdb</refentrytitle>
-           <manvolnum>7</manvolnum></citerefentry>.
-         </para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term>CTDB_SCRIPT_LOG_LEVEL=<parameter>DEBUGLEVEL</parameter></term>
-       <listitem>
-         <para>
-           Defaults to ERR.
-         </para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term>CTDB_START_AS_DISABLED=yes|no</term>
-       <listitem>
-         <para>
-           Default is no.
-         </para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term>CTDB_START_AS_STOPPED=yes|no</term>
-       <listitem>
-         <para>
-           Default is no.
-         </para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term>CTDB_TRANSPORT=tcp|infiniband</term>
-       <listitem>
-         <para>
-           Defaults to tcp.
-         </para>
-       </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </refsect1>
-
-  <refsect1>
-    <title>FILES</title>
-
-    <simplelist>
-      <member><filename>/usr/local/etc/ctdb/ctdbd.conf</filename></member>
-      <member><filename>/etc/sysconfig/ctdb</filename></member>
-      <member><filename>/etc/default/ctdb</filename></member>
-    </simplelist>
-  </refsect1>
-
-  <refsect1>
-    <title>SEE ALSO</title>
-    <para>
-      <citerefentry><refentrytitle>ctdbd</refentrytitle>
-      <manvolnum>1</manvolnum></citerefentry>,
-
-      <citerefentry><refentrytitle>ctdbd_wrapper</refentrytitle>
-      <manvolnum>1</manvolnum></citerefentry>,
-
-      <citerefentry><refentrytitle>onnode</refentrytitle>
-      <manvolnum>1</manvolnum></citerefentry>,
-
-      <citerefentry><refentrytitle>ctdb</refentrytitle>
-      <manvolnum>7</manvolnum></citerefentry>,
-
-      <citerefentry><refentrytitle>ctdb-tunables</refentrytitle>
-      <manvolnum>7</manvolnum></citerefentry>,
-
-      <ulink url="http://ctdb.samba.org/"/>
-    </para>
-  </refsect1>
-
-  <refentryinfo>
-    <author>
-      <contrib>
-       This documentation was written by
-       Amitay Isaacs,
-       Martin Schwenke
-      </contrib>
-    </author>
-
-    <copyright>
-      <year>2007</year>
-      <holder>Andrew Tridgell</holder>
-      <holder>Ronnie Sahlberg</holder>
-    </copyright>
-    <legalnotice>
-      <para>
-       This program is free software; you can redistribute it and/or
-       modify it under the terms of the GNU General Public License as
-       published by the Free Software Foundation; either version 3 of
-       the License, or (at your option) any later version.
-      </para>
-      <para>
-       This program is distributed in the hope that it will be
-       useful, but WITHOUT ANY WARRANTY; without even the implied
-       warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-       PURPOSE.  See the GNU General Public License for more details.
-      </para>
-      <para>
-       You should have received a copy of the GNU General Public
-       License along with this program; if not, see
-       <ulink url="http://www.gnu.org/licenses"/>.
-      </para>
-    </legalnotice>
-  </refentryinfo>
-
-</refentry>
index d717b84d2bda9bfbc1ee805b66c467abf5d556a4..a1b92e3ef893dee66ec7ebae563acd70f2a3bcd2 100644 (file)
       file containing the PID of the main CTDB daemon.
     </para>
 
-    <para>
-      ctdbd_wrapper constructs command-line options for ctdbd from
-      configuration variables specified in
-      <citerefentry><refentrytitle>ctdbd.conf</refentrytitle>
-      <manvolnum>5</manvolnum></citerefentry>.
-    </para>
-
     <para>
       See <citerefentry><refentrytitle>ctdb</refentrytitle>
       <manvolnum>7</manvolnum></citerefentry> for an overview of CTDB.
@@ -61,9 +54,6 @@
       <citerefentry><refentrytitle>ctdb.sysconfig</refentrytitle>
       <manvolnum>5</manvolnum></citerefentry>,
 
-      <citerefentry><refentrytitle>ctdbd.conf</refentrytitle>
-      <manvolnum>5</manvolnum></citerefentry>,
-
       <citerefentry><refentrytitle>ctdb</refentrytitle>
       <manvolnum>7</manvolnum></citerefentry>,
 
index fc41d16eb4e6500e91e226bf13d436398bfdd3af..a4ea2228b509b15a06ee978c87af160f74f748e2 100644 (file)
@@ -6,12 +6,6 @@ Sample CTDB configuration files:
   o 11.natgw.options - Options for the 11.natgw event script
   o 91.lvs.options   - Options for the 91.lvs event script
 
-Sample old-style CTDB cluster configurations
-
-  o cluster.conf  - Basic cluster setup
-  o natgw.conf    - Basic cluster setup with NAT gateway feature
-  o external.conf - Basic cluster setup with externally managed public IP addresses
-
 Sample 60.nfs configuration for NFS ganesha - callout script and
 .check file
 
diff --git a/ctdb/doc/examples/cluster.conf b/ctdb/doc/examples/cluster.conf
deleted file mode 100644 (file)
index 2ad9b2b..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# CTDB configuration for simple cluster
-#
-# This is the sample configuration for a 3-node CTDB cluster providing file
-# services via Samba and NFS.
-#
-# Cluster details:
-#
-#                internal network (192.168.1.0/24)
-#   -------+----------------------+-----------------------+----------
-#          |                      |                       |
-#          |                      |                       |
-#     eth0 | 192.168.1.1     eth0 | 192.168.1.2      eth0 | 192.168.1.3
-#    +-----+-----+          +-----+-----+           +-----+-----+
-#    |           |          |           |           |           |
-#    |  Node 1   |          |  Node 2   |           |  Node 3   |
-#    |           |          |           |           |           |
-#    +-----+-----+          +-----+-----+           +-----+-----+
-#     eth1 | 10.1.1.1        eth1 | 10.1.1.2         eth1 | 10.1.1.3
-#          |                      |                       |
-#          |                      |                       |
-#   -------+----------------------+-----------------------+----------
-#                  public network (10.1.1.0/24)
-#
-#
-# Storage details:
-#
-#  Each node has a shared storage - /shared
-#
-#
-# Service details:
-#
-#  Cluster provides file services on following IP addresses
-#
-#     10.1.1.101 - 10.1.1.106
-#
-#  Each node also has a fixed IP address on public network.  This is used to
-#  communicate to network infrastructure (e.g. DNS, Active Directory, ...).
-#  Make sure that file services are not available on these fixed IP addresses
-#  (e.g. network filtering, using cluster hostname instead of IPs)
-
-
-CTDB_RECOVERY_LOCK=/shared/recovery.lock
-
-#
-# Nodes configuration
-#
-# ---------- /etc/ctdb/nodes ----------
-# 192.168.1.1
-# 192.168.1.2
-# 192.168.1.3
-# ---------- /etc/ctdb/nodes ----------
-#
-#
-# Public addresses configuration
-#
-# ---------- /etc/ctdb/public_addresses ----------
-# 10.1.1.101/24 eth1
-# 10.1.1.102/24 eth1
-# 10.1.1.103/24 eth1
-# 10.1.1.104/24 eth1
-# 10.1.1.105/24 eth1
-# 10.1.1.106/24 eth1
-# ---------- /etc/ctdb/public_addresses ----------
-#
-# Enable logging to syslog
-CTDB_LOGGING=syslog
-
-# Default log level
-CTDB_DEBUGLEVEL=NOTICE
-
-# Auto start/stop managed services
-CTDB_AUTO_STARTSTOP=yes
-
-#
-# Samba configuration
-#
-CTDB_MANAGES_SAMBA=yes
-# CTDB_SAMBA_SKIP_SHARE_CHECK=yes
-
-CTDB_MANAGES_WINBIND=yes
-
-#
-# NFS configuration
-#
-CTDB_MANAGES_NFS=yes
-CTDB_RPCINFO_LOCALHOST="127.0.0.1"
diff --git a/ctdb/doc/examples/lvs.conf b/ctdb/doc/examples/lvs.conf
deleted file mode 100644 (file)
index e9ade9d..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# CTDB configuration for simple cluster with LVS
-#
-# This is the sample configuration for a 3-node CTDB cluster providing file
-# services via Samba and NFS.
-#
-# Cluster details:
-#
-#                internal network (192.168.1.0/24)
-#   -------+----------------------+-----------------------+----------
-#          |                      |                       |
-#          |                      |                       |
-#     eth0 | 192.168.1.1     eth0 | 192.168.1.2      eth0 | 192.168.1.3
-#    +-----+-----+          +-----+-----+           +-----+-----+
-#    |           |          |           |           |           |
-#    |  Node 1   |          |  Node 2   |           |  Node 3   |
-#    |           |          |           |           |           |
-#    +-----+-----+          +-----+-----+           +-----+-----+
-#     eth1 | 10.1.1.1        eth1 | 10.1.1.2         eth1 | 10.1.1.3
-#          |                      |                       |
-#          |                      |                       |
-#   -------+----------------------+-----------------------+-----+----
-#                  public network (10.1.1.0/24)                 |
-#                                                               | 10.1.1.254
-#                                                               o (router)
-#
-# Storage details:
-#
-#  Each node has a shared storage - /shared
-#
-#
-# Service details:
-#
-#  Cluster provides file services on single IP address
-#
-#     10.1.1.101
-#
-# Since LVS in CTDB uses direct routing, each node needs to have a static IP
-# address on the public network.
-
-
-CTDB_RECOVERY_LOCK=/shared/recovery.lock
-
-#
-# Nodes configuration
-#
-# ---------- /etc/ctdb/nodes ----------
-# 192.168.1.1
-# 192.168.1.2
-# 192.168.1.3
-# ---------- /etc/ctdb/nodes ----------
-#
-# Enable logging to syslog
-CTDB_LOGGING=syslog
-
-# Default log level
-CTDB_DEBUGLEVEL=NOTICE
-
-# Auto start/stop managed services
-CTDB_AUTO_STARTSTOP=yes
-
-#
-# Samba configuration
-#
-CTDB_MANAGES_SAMBA=yes
-# CTDB_SAMBA_SKIP_SHARE_CHECK=yes
-
-CTDB_MANAGES_WINBIND=yes
-
-#
-# NFS configuration
-#
-CTDB_MANAGES_NFS=yes
-CTDB_RPCINFO_LOCALHOST="127.0.0.1"
-
-#
-# LVS configuration
-#
-# ---------- /etc/ctdb/lvs_nodes ----------
-# 192.168.1.1
-# 192.168.1.2
-# 192.168.1.3
-# ---------- /etc/ctdb/lvs_nodes ----------
-#
-CTDB_LVS_NODES=/etc/ctdb/lvs_nodes
-
-CTDB_LVS_PUBLIC_IP=10.1.1.101
-CTDB_LVS_PUBLIC_IFACE=eth1
diff --git a/ctdb/doc/examples/natgw.conf b/ctdb/doc/examples/natgw.conf
deleted file mode 100644 (file)
index 5fbb2d1..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# CTDB configuration for simple cluster with NAT gateway
-#
-# This is the sample configuration for a 3-node CTDB cluster providing file
-# services via Samba and NFS.
-#
-# Cluster details:
-#
-#                internal network (192.168.1.0/24)
-#   -------+----------------------+-----------------------+----------
-#          |                      |                       |
-#          |                      |                       |
-#     eth0 | 192.168.1.1     eth0 | 192.168.1.2      eth0 | 192.168.1.3
-#    +-----+-----+          +-----+-----+           +-----+-----+
-#    |           |          |           |           |           |
-#    |  Node 1   |          |  Node 2   |           |  Node 3   |
-#    |           |          |           |           |           |
-#    +-----+-----+          +-----+-----+           +-----+-----+
-#     eth1 |                 eth1 |                  eth1 |
-#          |                      |                       |
-#          |                      |                       |
-#   -------+----------------------+-----------------------+-----+----
-#                  public network (10.1.1.0/24)                 |
-#                                                               | 10.1.1.254
-#                                                               o (router)
-#
-# Storage details:
-#
-#  Each node has a shared storage - /shared
-#
-#
-# Service details:
-#
-#  Cluster provides file services on following IP addresses
-#
-#     10.1.1.101 - 10.1.1.106
-#
-#  When a node is not hosting any IPs, it cannot connect to network
-#  infrastructure (e.g. DNS, Active Directory, ...).
-#
-#  Using NAT gateway feature of CTDB allows a node not hosting IPs to connect
-#  to network infrastructure.
-
-
-CTDB_RECOVERY_LOCK=/shared/recovery.lock
-
-#
-# Nodes configuration
-#
-# ---------- /etc/ctdb/nodes ----------
-# 192.168.1.1
-# 192.168.1.2
-# 192.168.1.3
-# ---------- /etc/ctdb/nodes ----------
-#
-#
-# Public addresses configuration
-#
-# ---------- /etc/ctdb/public_addresses ----------
-# 10.1.1.101/24 eth1
-# 10.1.1.102/24 eth1
-# 10.1.1.103/24 eth1
-# 10.1.1.104/24 eth1
-# 10.1.1.105/24 eth1
-# 10.1.1.106/24 eth1
-# ---------- /etc/ctdb/public_addresses ----------
-#
-# Enable logging to syslog
-CTDB_LOGGING=syslog
-
-# Default log level
-CTDB_DEBUGLEVEL=NOTICE
-
-# Auto start/stop managed services
-CTDB_AUTO_STARTSTOP=yes
-
-#
-# Samba configuration
-#
-CTDB_MANAGES_SAMBA=yes
-# CTDB_SAMBA_SKIP_SHARE_CHECK=yes
-
-CTDB_MANAGES_WINBIND=yes
-
-#
-# NFS configuration
-#
-CTDB_MANAGES_NFS=yes
-CTDB_RPCINFO_LOCALHOST="127.0.0.1"
-
-#
-# NAT gateway configuration
-#
-# ---------- /etc/ctdb/natgw_nodes ----------
-# 192.168.1.1
-# 192.168.1.2
-# 192.168.1.3
-# ---------- /etc/ctdb/natgw_nodes ----------
-#
-CTDB_NATGW_PUBLIC_IP=10.1.1.121/24
-CTDB_NATGW_PUBLIC_IFACE=eth1
-CTDB_NATGW_DEFAULT_GATEWAY=10.1.1.254
-CTDB_NATGW_PRIVATE_NETWORK=192.168.1.0/24
-CTDB_NATGW_NODES=/etc/ctdb/natgw_nodes
index 1966ac7e24fe15a86a7c7cacc82782d7748a4727..55a0175a7745014197b73ff0b56e7257e8896ab2 100644 (file)
@@ -114,7 +114,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sudoers.d
 DESTDIR=$RPM_BUILD_ROOT ./buildtools/bin/waf install
 
 install -m644 config/ctdb.conf $RPM_BUILD_ROOT%{_sysconfdir}/ctdb
-install -m644 config/ctdbd.conf $RPM_BUILD_ROOT%{_sysconfdir}/ctdb
 install -m644 config/ctdb.tunables $RPM_BUILD_ROOT%{_sysconfdir}/ctdb
 install -m644 config/script.options $RPM_BUILD_ROOT%{_sysconfdir}/ctdb
 
@@ -153,7 +152,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 
 %config(noreplace) %{_sysconfdir}/ctdb/ctdb.conf
-%config(noreplace) %{_sysconfdir}/ctdb/ctdbd.conf
 %config(noreplace) %{_sysconfdir}/ctdb/ctdb.tunables
 %config(noreplace) %{_sysconfdir}/ctdb/script.options
 %{_sysconfdir}/ctdb/notify.sh
@@ -213,7 +211,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/ctdb.conf.5.gz
 %{_mandir}/man5/ctdb-script.options.5.gz
 %{_mandir}/man5/ctdb.sysconfig.5.gz
-%{_mandir}/man5/ctdbd.conf.5.gz
 %{_mandir}/man7/ctdb.7.gz
 %{_mandir}/man7/ctdb-statistics.7.gz
 %{_mandir}/man7/ctdb-tunables.7.gz
index d3b02d6e6fc69950e8aa42fa7331865fcca78b5a..22f1b2677cd85bf012318b2a6a36cbdb4cb2890f 100644 (file)
@@ -51,7 +51,6 @@ manpages_misc = [
     'ctdb.conf.5',
     'ctdb-script.options.5',
     'ctdb.sysconfig.5',
-    'ctdbd.conf.5',
     'ctdb.7',
     'ctdb-statistics.7',
     'ctdb-tunables.7',