diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-04-30 03:32:29 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-05-06 15:45:10 +1000 |
| commit | e9abc9c070368a81771a541701b03f75da1c5352 (patch) | |
| tree | ef3bfdec6b20da2f05b5cd11d98be03492646b79 /ctdb/tests/eventscripts/13.per_ip_routing.017.sh | |
| parent | c56acf71277dc269f17c239acab7a46c982dea51 (diff) | |
| download | samba-e9abc9c070368a81771a541701b03f75da1c5352.tar.gz samba-e9abc9c070368a81771a541701b03f75da1c5352.tar.xz samba-e9abc9c070368a81771a541701b03f75da1c5352.zip | |
eventscripts: Simplify handling of $service name in "managed" functions
Complicated argument handling was introduced to deal with multiple
services per eventscript. This was a failure and we split 50.samba.
This simplifies several functions to use global $service_name
unconditionally instead of having an optional argument.
$service_name is no automatically longer set in the functions file.
This means it needs to be explicitly set in 13.per_ip_routing because
this script uses ctdb_service_check_reconfigure().
Eventscript unit test infrastructure needs to set $service_name during
fake service setup, and policy routing tests need to be updated
accordingly.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 27aab8783898a50da8c4bc887b512d8f0c0d842c)
Diffstat (limited to 'ctdb/tests/eventscripts/13.per_ip_routing.017.sh')
| -rwxr-xr-x | ctdb/tests/eventscripts/13.per_ip_routing.017.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.017.sh b/ctdb/tests/eventscripts/13.per_ip_routing.017.sh index dcb436ac66a..8870015501f 100755 --- a/ctdb/tests/eventscripts/13.per_ip_routing.017.sh +++ b/ctdb/tests/eventscripts/13.per_ip_routing.017.sh @@ -10,7 +10,7 @@ setup_ctdb_policy_routing create_policy_routing_config 1 default # no takeip, but reconfigure should add any missing routes -ok 'Reconfiguring service "13.per_ip_routing"...' +ok "Reconfiguring service \"${service_name}\"..." simple_test_event "reconfigure" check_routes 1 default |