diff options
| author | Martin Schwenke <martin@meltin.net> | 2009-04-21 12:55:17 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2009-04-21 12:55:17 +1000 |
| commit | 1b86cd17fb4d6c4a4ecf9c056cbbbe675e4b6e38 (patch) | |
| tree | 7d7b5ba725f38712a8824d94c2ce044d5386c109 /base/root/scripts | |
| parent | 02064916cc9b3f3d955fe88fae894eed4feaadb9 (diff) | |
Dynamic configuration of public addresses in conf.base-SoFS*.
New function make_public_addresses() generates a template fragment for
public addresses. New configuration variable PUBLIC_ADDRESSES is set
to "|make_public_addresses", which builds a sensible set of public
addresses with addresses in a range relative to nodes' management
addresses. conf.base-SOFS* files include @@@PUBLIC_ADDRESSES@@@
rather than "static" public address definitions.
This means that the default public addresses for multiple virtual
clusters on the same virtualisation host will no longer clash.
The old behaviour, with public addresses whose suffixes start at 101,
can be re-enabled by setting PUBLIC_ADDRESSES to
"|make_public_addresses 101 1 3". A more sensible approach, which
generates public addresses for the right number of nodes and excludes
public addresses from node 1, involves setting PUBLIC_ADDRESSES to
just "|make_public_addresses 101".
Signed-off-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'base/root/scripts')
| -rw-r--r-- | base/root/scripts/conf.base-SoFS | 18 | ||||
| -rw-r--r-- | base/root/scripts/conf.base-SoFS-1.5.3 | 19 |
2 files changed, 2 insertions, 35 deletions
diff --git a/base/root/scripts/conf.base-SoFS b/base/root/scripts/conf.base-SoFS index 10b5dfd..aceb73e 100644 --- a/base/root/scripts/conf.base-SoFS +++ b/base/root/scripts/conf.base-SoFS @@ -110,23 +110,7 @@ read only = no browseable = yes -[/etc/ctdb/public_addresses:@@CLUSTER@@n1.@@DOMAIN@@] - -[/etc/ctdb/public_addresses:@@CLUSTER@@n2.@@DOMAIN@@] - @@IPBASE@@.1.101/24 eth1 - @@IPBASE@@.1.102/24 eth1 - @@IPBASE@@.1.103/24 eth1 - @@IPBASE@@.2.101/24 eth2 - @@IPBASE@@.2.102/24 eth2 - @@IPBASE@@.2.103/24 eth2 - -[/etc/ctdb/public_addresses:@@CLUSTER@@n3.@@DOMAIN@@] - @@IPBASE@@.1.101/24 eth1 - @@IPBASE@@.1.102/24 eth1 - @@IPBASE@@.1.103/24 eth1 - @@IPBASE@@.2.101/24 eth2 - @@IPBASE@@.2.102/24 eth2 - @@IPBASE@@.2.103/24 eth2 +@@@PUBLIC_ADDRESSES@@@ [/etc/krb5.conf] [logging] diff --git a/base/root/scripts/conf.base-SoFS-1.5.3 b/base/root/scripts/conf.base-SoFS-1.5.3 index ac09782..5756b2b 100644 --- a/base/root/scripts/conf.base-SoFS-1.5.3 +++ b/base/root/scripts/conf.base-SoFS-1.5.3 @@ -130,24 +130,7 @@ read only = no browseable = yes - -[/etc/ctdb/public_addresses:@@CLUSTER@@n1.@@DOMAIN@@] - -[/etc/ctdb/public_addresses:@@CLUSTER@@n2.@@DOMAIN@@] - @@IPBASE@@.1.101/24 eth1 - @@IPBASE@@.1.102/24 eth1 - @@IPBASE@@.1.103/24 eth1 - @@IPBASE@@.2.101/24 eth2 - @@IPBASE@@.2.102/24 eth2 - @@IPBASE@@.2.103/24 eth2 - -[/etc/ctdb/public_addresses:@@CLUSTER@@n3.@@DOMAIN@@] - @@IPBASE@@.1.101/24 eth1 - @@IPBASE@@.1.102/24 eth1 - @@IPBASE@@.1.103/24 eth1 - @@IPBASE@@.2.101/24 eth2 - @@IPBASE@@.2.102/24 eth2 - @@IPBASE@@.2.103/24 eth2 +@@@PUBLIC_ADDRESSES@@@ [/etc/krb5.conf] [logging] |