From: Martin Schwenke Date: Mon, 30 Jun 2014 00:14:36 +0000 (+1000) Subject: Remove unused has_public_addresses_* functions X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=38cef6cddeb4f526144634bfc073d525fd139abf;p=amitay%2Fautocluster.git Remove unused has_public_addresses_* functions They have been unused since public address generation was changed. Signed-off-by: Martin Schwenke --- diff --git a/config.d/00base.defconf b/config.d/00base.defconf index 3fe969b..d58ee03 100644 --- a/config.d/00base.defconf +++ b/config.d/00base.defconf @@ -239,11 +239,6 @@ defconf DNSSEARCH "$DOMAIN" \ defconf NETWORKS "10.0.0.0/24,eth0,gw=10.0.0.1 10.0.1.0/24,eth1 10.0.2.0/24,eth2" \ "" "description of IP networks" -has_public_addresses_DEFAULT () -{ - false -} - make_public_addresses() { local firstip="${1:-$[${FIRSTIP} + ${PUBLIC_IP_OFFSET}]}" @@ -553,11 +548,6 @@ create_node_rhel_base () create_node_COMMON "$name" "$ip_offset" "$type" } -has_public_addresses_rhel_base () -{ - true -} - ############################## # Authentication method diff --git a/config.d/50sofs.defconf b/config.d/50sofs.defconf index 88f402d..053775a 100644 --- a/config.d/50sofs.defconf +++ b/config.d/50sofs.defconf @@ -72,17 +72,6 @@ create_node_sofs_storage () create_node_COMMON "$name" "$ip_offset" "$type" } -has_public_addresses_rhel_base () -{ - # rhel_base nodes have public addresses if there are no sofs_* nodes. - [ "${NODES/sofs_*:/}" = "$NODES" ] -} - -has_public_addresses_sofs_front () -{ - true -} - shared_disk_iscsi_setup_base () { # Do the iSCSI setup on this node if there are no sofs_storage nodes