diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-06-24 11:40:27 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2014-07-02 14:17:17 +1000 |
| commit | ddd0c88bf8fa971506b96b33c15d120c461fd12e (patch) | |
| tree | 2641303efbd5409ff49575b2d047a436aead4941 /config.d | |
| parent | 8e389a281eb50ab4e552a1dea3546a6f2ea7bfdf (diff) | |
| download | autocluster-ddd0c88bf8fa971506b96b33c15d120c461fd12e.tar.gz autocluster-ddd0c88bf8fa971506b96b33c15d120c461fd12e.tar.xz autocluster-ddd0c88bf8fa971506b96b33c15d120c461fd12e.zip | |
Remove SoFS GUI support
This hasn't been used in a long time.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'config.d')
| -rw-r--r-- | config.d/50sofs.defconf | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/config.d/50sofs.defconf b/config.d/50sofs.defconf index b95fecb..997c0a3 100644 --- a/config.d/50sofs.defconf +++ b/config.d/50sofs.defconf @@ -3,26 +3,9 @@ defconf SOFS_VERSION "1.5.3" \ "<version>" "Version of SoFS to install" -defconf WITH_SOFS_GUI "" \ - "<0|1>" "1 if the SoFS GUI packages should be installed" - -defconf SOFS_GUI_PACKAGES "" \ - "<pkgs>" "List of SoFS GUI packages to install in addition to sofs-toolset" - defconf SOFS_EXTRA_PACKAGES "" \ "<pkgs>" "List of extra SoFS packages to install" -# memory for the node that will run the SoFS GUI - used if it is -# greater than $MEM -defconf GUIMEM 720896 \ - "<n>" "memory allocated for the management node" - -defconf JAVA_MIN_SIZE "200M" \ - "<n>M" "minimum size of Java heap for SoFS GUI" - -defconf JAVA_MAX_SIZE "400M" \ - "<n>M" "maximum size of Java heap for SoFS GUI" - ############################## register_hook hack_nodes_functions hack_nodes_sofs @@ -31,22 +14,9 @@ NSD_SERVERS= hack_nodes_sofs () { - # Compatibility code to handle WITH_SOFS_GUI. - if [ "$WITH_SOFS_GUI" = 0 -a "${NODES/sofs_gui:/}" != "$NODES" ] ; then - # No sofs_gui nodes desired - turn them into sofs_front. - NODES="${NODES//sofs_gui:/sofs_front:}" - elif [ "$WITH_SOFS_GUI" = 1 -a "${NODES/sofs_gui:/}" = "$NODES" ] ; then - # sofs_gui desired but none configured, convert the 1st - # sofs_front... if there is one. - [ "${NODES/sofs_front:/}" != "$NODES" ] || \ - die "Can not magically create sofs_gui node. WITH_SOFS_GUI=1, NODES does not contain a sofs_gui node and there are no sofs_front nodes to covert." - NODES="${NODES/sofs_front:/sofs_gui:}" - fi - if [ "${NODES/sofs_*:/}" != "$NODES" ] ; then # We have sofs_* nodes so name and tag them. Also untag any # rhel_base nodes. - local node_count_sofs_gui=0 local node_count_sofs_front=0 local node_count_sofs_storage=0 hack_filter () @@ -63,12 +33,6 @@ hack_nodes_sofs () rhel_base) ctdb_node=0 ;; - sofs_gui) - node_count_sofs_gui=$(($node_count_sofs_gui + 1)) - name="${CLUSTER}gui${node_count_sofs_gui}" - ctdb_node=1 - hack_shareddisks - ;; sofs_front) node_count_sofs_front=$(($node_count_sofs_front + 1)) name="${CLUSTER}front${node_count_sofs_front}" @@ -88,27 +52,6 @@ hack_nodes_sofs () fi } -create_node_sofs_gui () -{ - local ip_offset="$1" - local name="$2" - local ctdb_node="$3" - - echo "Creating SoFS GUI node $name" - - # GUI nodes need more memory. - if [ $GUIMEM -gt $MEM ]; then - local MEM=$GUIMEM - echo "Increased MEM=$MEM to accommodate GUI" - fi - - # Only configure shared disks If there are no sofs_storage nodes. - [ "${NODES/sofs_storage:/}" = "$NODES" ] && \ - local SHAREDDISK_TEMPLATE="$SOFS_SHAREDDISK_TEMPLATE" - - create_node_COMMON "$name" "$ip_offset" "$type" -} - create_node_sofs_front () { local ip_offset="$1" |