Rename common_nodelist_hacking() to cluster_nodelist_hacking()
authorMartin Schwenke <martin@meltin.net>
Wed, 2 Jul 2014 04:07:14 +0000 (14:07 +1000)
committerMartin Schwenke <martin@meltin.net>
Wed, 2 Jul 2014 10:26:52 +0000 (20:26 +1000)
... and just call it once before doing any cluster operations.

Signed-off-by: Martin Schwenke <martin@meltin.net>
autocluster

index 25756b5abdd66e36fee9e949a6790354eb86ae8a..69edc312c84fef96597369b772755981196c0858 100755 (executable)
@@ -430,7 +430,7 @@ Some cluster filesystems have problems with other characters."
 
 hosts_file=
 
-common_nodelist_hacking ()
+cluster_nodelist_hacking ()
 {
     # Rework the NODES list
     expand_nodes
@@ -513,8 +513,6 @@ cluster_create ()
     # Run hooks before doing anything else.
     run_hooks create_cluster_hooks
 
-    common_nodelist_hacking
-
     for_each_node call_func create_node
 
     echo "Cluster $CLUSTER created"
@@ -664,8 +662,6 @@ create_one_node ()
 
     mkdir -p $VIRTBASE/$CLUSTER $KVMLOG tmp
 
-    common_nodelist_hacking
-
     for n in $NODES ; do
        set -- $(IFS=: ; echo $n)
        [ $single_node_ip_offset -eq $2 ] || continue
@@ -1451,6 +1447,7 @@ case "$t" in
                *) usage ;;
            esac
        done
+       cluster_nodelist_hacking
        actions_run
        ;;