diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-06-30 16:39:15 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2014-07-02 20:26:52 +1000 |
| commit | fa26aa2e805ff739f3969892e7e302daa1eaef60 (patch) | |
| tree | 616e4ec9adb66acd6c526f918e1f218e8e0f1d88 /config.d | |
| parent | ec85e5975cba4ebf0db5906562cf0d8198dcd569 (diff) | |
| download | autocluster-fa26aa2e805ff739f3969892e7e302daa1eaef60.tar.gz autocluster-fa26aa2e805ff739f3969892e7e302daa1eaef60.tar.xz autocluster-fa26aa2e805ff739f3969892e7e302daa1eaef60.zip | |
Rework cluster_setup() to use node types instead of $CLUSTER_TYPE
* Remove configuration variable CLUSTER_TYPE
* Add "build" node type
* Rename setup scripts for "ad" and "build" node type
* Separate out some setup_node_nas.sh from setup_cluster_nas.sh
* Make install_packages.sh and cluster_setup.sh more verbose
* Separate out clusterfs_setup.sh
Signed-off-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'config.d')
| -rw-r--r-- | config.d/00base.defconf | 3 | ||||
| -rw-r--r-- | config.d/50node_nas.defconf | 10 | ||||
| -rw-r--r-- | config.d/52node_build.defconf | 22 | ||||
| -rw-r--r-- | config.d/55node_storage_gpfs.defconf | 10 | ||||
| -rw-r--r-- | config.d/57node_ad.defconf (renamed from config.d/70ad.defconf) | 10 |
5 files changed, 52 insertions, 3 deletions
diff --git a/config.d/00base.defconf b/config.d/00base.defconf index 4f0440a..d750e33 100644 --- a/config.d/00base.defconf +++ b/config.d/00base.defconf @@ -4,9 +4,6 @@ # Cluster -defconf CLUSTER_TYPE "samba" \ - "samba|ad|build" "Type of cluster, for configuration stage" - defconf CLUSTERFS_TYPE "gpfs" \ "<gpfs|?>" "type of cluster filesystem to use" diff --git a/config.d/50node_nas.defconf b/config.d/50node_nas.defconf index a0ac0c1..794c42f 100644 --- a/config.d/50node_nas.defconf +++ b/config.d/50node_nas.defconf @@ -31,3 +31,13 @@ node_has_shared_disks_nas () { ! have_dedicated_storage_nodes } + +cluster_setup_tasks_nas () +{ + case "$1" in + install_packages) echo "clusterfs nas" ;; + setup_clusterfs) echo "clusterfs" ;; + setup_node) echo "nas" ;; + setup_cluster) echo "nas" ;; + esac +} diff --git a/config.d/52node_build.defconf b/config.d/52node_build.defconf new file mode 100644 index 0000000..b375e0c --- /dev/null +++ b/config.d/52node_build.defconf @@ -0,0 +1,22 @@ +# Hey Emacs, this is a -*- shell-script -*- !!! + +create_node_build () +{ + local ip_offset="$1" + local name="$2" + local ctdb_node="$3" + + echo "Creating build node $name" + + create_node_COMMON "$name" "$ip_offset" "$type" +} + +cluster_setup_tasks_build () +{ + case "$1" in + install_packages) echo "clusterfs build" ;; + setup_clusterfs) echo "" ;; + setup_node) echo "build" ;; + setup_cluster) echo "" ;; + esac +} diff --git a/config.d/55node_storage_gpfs.defconf b/config.d/55node_storage_gpfs.defconf index 4601714..4ed9ebd 100644 --- a/config.d/55node_storage_gpfs.defconf +++ b/config.d/55node_storage_gpfs.defconf @@ -40,3 +40,13 @@ is_dedicated_storage_node_storage_gpfs () { true } + +cluster_setup_tasks_storage_gpfs () +{ + case "$1" in + install_packages) echo "clusterfs" ;; + setup_clusterfs) echo "clusterfs" ;; + setup_node) echo "" ;; + setup_cluster) echo "" ;; + esac +} diff --git a/config.d/70ad.defconf b/config.d/57node_ad.defconf index 2915335..8abeade 100644 --- a/config.d/70ad.defconf +++ b/config.d/57node_ad.defconf @@ -8,3 +8,13 @@ defconf AD_FUNCTION_LEVEL "2008" \ defconf AD_NETBIOS_NAME "samba4" \ "<string>" "NetBIOS name to use for AD server" + +cluster_setup_tasks_ad () +{ + case "$1" in + install_packages) echo "ad" ;; + setup_clusterfs) echo "" ;; + setup_node) echo "ad" ;; + setup_cluster) echo "" ;; + esac +} |