diff options
author | Martin Schwenke <martin@meltin.net> | 2014-06-24 15:01:16 +1000 |
---|---|---|
committer | Martin Schwenke <martin@meltin.net> | 2014-07-02 14:17:17 +1000 |
commit | 8a86ce8662ce92b55fc9b164626677d7b30460ab (patch) | |
tree | 0d4bbb4f2218c58eea422a45b4c7431873b40391 /autocluster | |
parent | afc0e11395909098571fd3c8a892058397852b82 (diff) | |
download | autocluster-8a86ce8662ce92b55fc9b164626677d7b30460ab.tar.gz autocluster-8a86ce8662ce92b55fc9b164626677d7b30460ab.tar.xz autocluster-8a86ce8662ce92b55fc9b164626677d7b30460ab.zip |
Cleanup post-boot cluster configuration
* Single entry point is now setup_cluster.sh.
* Rename old setup_cluster.sh to setup_cluster_nas.sh.
* Split setup_ad_server.sh into install_ad_server.sh and
setup_cluster_ad_server.sh.
* Split setup_build.sh into install_build.sh and
setup_cluster_build.sh.
* Rename setup_gpfs.sh to setup_clusterfs_gpfs.sh.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'autocluster')
-rwxr-xr-x | autocluster | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/autocluster b/autocluster index efeca12..ccbec87 100755 --- a/autocluster +++ b/autocluster @@ -581,14 +581,13 @@ cluster_configure () case "$CLUSTER_TYPE" in "build") - # Build node doesn't really need CTDB/Samba to be - # installed, if the packages are not present in the repo, - # they're skipped. - $ssh "$n1" "./scripts/setup_build.sh || true" + $ssh "$n1" ./scripts/install_packages.sh clusterfs build + $ssh "$n1" ./scripts/setup_cluster.sh build ;; "ad") - $ssh "$n1" ./scripts/setup_ad_server.sh + $ssh "$n1" ./scripts/install_packages.sh ad_server + $ssh "$n1" ./scripts/configure_cluster.sh ad_server ;; "samba") @@ -600,14 +599,8 @@ cluster_configure () for i in $nodes ; do $ssh "$i" ./scripts/install_packages.sh clusterfs nas done - $ssh "$n1" ./scripts/setup_gpfs.sh - if [ "$AUTH_METHOD" = "winbind" ]; then - args="-UAdministrator%${AD_ADMIN_PASS}" - else - args="" - fi - $ssh "$n1" ./scripts/setup_cluster.sh "$args" + $ssh "$n1" ./scripts/setup_cluster.sh clusterfs nas ;; esac } |