Tweak the usage message for -g option.
Print an error if no node groups defined, instead of curious Python
error.
Signed-off-by: Martin Schwenke <martin@meltin.net>
# reassignments. Running with --nd fixes this.
import ctdb_takeover
+import sys
from optparse import make_option
import string
ctdb_takeover.process_args([
make_option("-g", "--group",
- action="append", type="string", dest="groups"),
+ action="append", type="string", dest="groups",
+ help="define a node group using N@IPs syntax"),
])
def expand_range(r):
c = ctdb_takeover.Cluster()
+if ctdb_takeover.options.groups is None:
+ print "Error: no node groups defined."
+ sys.exit(1)
+
for g in ctdb_takeover.options.groups:
add_node_group(g)
+++ /dev/null
-#!/usr/bin/env python
-
-# This example demonstrates a node pool configuration. Is it meant to
-# be the same as node_pool_simple.py, but with a couple of nodes added
-# later, so they are listed after the management node.
-
-# When run with deterministic IPs (use "-d" to show the problem) it
-# does many gratuitous IP reassignments.
-
-from ctdb_takeover import Cluster, Node, process_args
-
-process_args()
-
-addresses1 = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H'] + ['P', 'Q', 'R', 'S', 'T', 'U']
-addresses2 = ['I', 'J', 'K', 'L']
-
-c = Cluster()
-
-for i in range(4):
- c.add_node(Node(addresses1))
-
-for i in range(3):
- c.add_node(Node(addresses2))
-
-c.add_node(Node([]))
-c.add_node(Node(addresses1))
-c.add_node(Node(addresses2))
-
-c.recover()
-
-c.random_iterations()
+++ /dev/null
-#!/usr/bin/env python
-
-# This example demonstrates a simple, sensible node pool
-# configuration. When run with deterministic IPs (use "-d" to show
-# the problem) it does many gratuitous IP reassignments.
-
-from ctdb_takeover import Cluster, Node, process_args
-
-process_args()
-
-addresses1 = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H']
-addresses2 = ['I', 'J', 'K']
-
-c = Cluster()
-
-for i in range(4):
- c.add_node(Node(addresses1))
-
-for i in range(3):
- c.add_node(Node(addresses2))
-
-c.add_node(Node([]))
-
-c.recover()
-
-c.random_iterations()