The branch, 2.5 has been updated
via 9246d3f56d3ed7ffa78fcf8952082cd38507da19 (commit)
via ddc0bb7de409cc116c8392ded761268865ffdfe8 (commit)
via d04a256e6f5c72b8b87a9bfb7673e7f7eb6feb30 (commit)
via dd82bca45a301807d6618a7a68fc4b9be7f383da (commit)
via fb3627fbcd7f3e513961b7780428c49f71373356 (commit)
via e39347f57d080572581e3bb21083760692bb18e1 (commit)
via 7891f005bcf7abd38612870e9d2f26ccf8cc7e68 (commit)
via 164c434d646927aea3ca700431cc8fbd2fdab1b2 (commit)
via ae7988c43527d01d5b7da199a6ee5df96faf3563 (commit)
via 4d7bdfaa059c0751dac8d116c82bcd0d49c2d228 (commit)
via 2ed1f247186e27ace5d082ae5df324a0072b244b (commit)
via e5af4b517b7ad3f9e75f8c4b14c551d11116eaf6 (commit)
via a150d068c07d5014582b56da089a658b3b7d74e6 (commit)
via 70404637614154fd27ca053cedeb3ab3b5ef1340 (commit)
via dad2bf3de71ed31a5c754e81abbee48c54aabae7 (commit)
via 1539157241d485343339877c5cbf83266b1e6c5e (commit)
via 27f0500629d2e51a39c9f195e5fa43eaf84587d5 (commit)
via c895fc4608b25743c15cce258b204d51e446965d (commit)
via 6621175edaef39405076bae866cc865b90c3dd9a (commit)
via ed05af69cdb316baacafb8b525a62acd425c35eb (commit)
via b1705d520d970dba4c3c02048de8847d0a54246d (commit)
via ce9041f9ae0df8075d96fce6afa20a7ba6df598f (commit)
via c8970d026dbc42a4e75649bc52aa078442a5fc5b (commit)
via 8ad53592764893ce00d583efcaafbd4cbbfdac13 (commit)
from c9536f0eee909dc96dffe46c78fd36ad5c0f7e1f (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=2.5
- Log -----------------------------------------------------------------
commit 9246d3f56d3ed7ffa78fcf8952082cd38507da19
Author: Martin Schwenke <mar...@meltin.net>
Date: Mon Mar 17 16:06:48 2014 +1100
tests: Add NAT gateway eventscript unit tests for static routes
Signed-off-by: Martin Schwenke <mar...@meltin.net>
Autobuild-User(master): Amitay Isaacs <ami...@samba.org>
Autobuild-Date(master): Wed Mar 26 06:24:01 CET 2014 on sn-devel-104
(Imported from commit 3d5b80f26ae65ce43ea25dd94274ec865f1c4026)
commit ddc0bb7de409cc116c8392ded761268865ffdfe8
Author: Martin Schwenke <mar...@meltin.net>
Date: Fri Mar 7 15:33:17 2014 +1100
eventscripts: CTDB_NATGW_STATIC_ROUTES can specify gateways
Extend CTDB_NATGW_STATIC_ROUTES so that each network can have an
optional gateway that overrides CTDB_NATGW_DEFAULT_GATEWAY.
Signed-off-by: Martin Schwenke <mar...@meltin.net>
(Imported from commit 70bbbbe448e96019c79832ac89563eefc25b1bae)
commit d04a256e6f5c72b8b87a9bfb7673e7f7eb6feb30
Author: Martin Schwenke <mar...@meltin.net>
Date: Fri Mar 7 15:11:36 2014 +1100
eventscripts: New configuration variable CTDB_NATGW_STATIC_ROUTES
This can be used to create more specific NATGW routes than the usual
NATGW default route.
Signed-off-by: Martin Schwenke <mar...@meltin.net>
(Imported from commit 34682affe9f19432851d5f921b58e692e5c6274d)
commit dd82bca45a301807d6618a7a68fc4b9be7f383da
Author: Martin Schwenke <mar...@meltin.net>
Date: Fri Mar 7 14:14:16 2014 +1100
eventscripts: Clarify that CTDB_NATGW_DEFAULT_GATEWAY is optional
This has been implied since the command to add the route has had
errors redirected to /dev/null. If infrastucture (e.g. ADS, DNS) is
on the same network as CTDB_NATGW_PUBLIC_IP then no route is
necessary.
Signed-off-by: Martin Schwenke <mar...@meltin.net>
(Imported from commit 7705efc35551a083873e2fed91ac42d021669df9)
commit fb3627fbcd7f3e513961b7780428c49f71373356
Author: Martin Schwenke <mar...@meltin.net>
Date: Fri Mar 7 14:07:17 2014 +1100
eventscripts: Improve check in NATGW "startup" event
Although the dots in $CTDB_NATGW_PUBLIC_IP could probably only help
match an invalid public IP address, this is only executed once so do
as exact a check as possible.
Use CTDB_BASE instead of hardcoding /etc/ctdb.
Make the error message less redundant.
Signed-off-by: Martin Schwenke <mar...@meltin.net>
(Imported from commit 8a3be1f1a979b8058cf7754632d60ab52d066d5c)
commit e39347f57d080572581e3bb21083760692bb18e1
Author: Martin Schwenke <mar...@meltin.net>
Date: Fri Mar 7 13:55:47 2014 +1100
eventscripts: Reformat natgw_clear()
Signed-off-by: Martin Schwenke <mar...@meltin.net>
(Imported from commit e22a22b1f72f75507941b5652bb9a0a2f42dd22f)
commit 7891f005bcf7abd38612870e9d2f26ccf8cc7e68
Author: Martin Schwenke <mar...@meltin.net>
Date: Fri Mar 7 13:47:43 2014 +1100
eventscripts: Rename some NAT gateway functions
delete_all() really needed renaming for clarity. While doing this,
might as well rename some of the others that don't start with
"natgw_".
Signed-off-by: Martin Schwenke <mar...@meltin.net>
(Imported from commit 3c839c60d15f11c538709c3e6b85d888131d6e30)
commit 164c434d646927aea3ca700431cc8fbd2fdab1b2
Author: Martin Schwenke <mar...@meltin.net>
Date: Mon Mar 17 06:15:39 2014 +1100
tests: Add a test for NAT gateway sanity checking
Signed-off-by: Martin Schwenke <mar...@meltin.net>
(Imported from commit c0e239473b532cebd31ef5e53d8cbf23c262c18d)
commit ae7988c43527d01d5b7da199a6ee5df96faf3563
Author: Martin Schwenke <mar...@meltin.net>
Date: Fri Mar 7 13:43:17 2014 +1100
eventscripts: Sanity check NAT gateway configuration
NAT gateway really can't operate unless most of the configuration
variables are set.
A check in delete_all() can be removed - strange that this isn't also
done in the add case.
Signed-off-by: Martin Schwenke <mar...@meltin.net>
(Imported from commit 4ee4925d416a86341bd76c11fa99ec9173682a1d)
commit 4d7bdfaa059c0751dac8d116c82bcd0d49c2d228
Author: Martin Schwenke <mar...@meltin.net>
Date: Fri Mar 7 13:35:03 2014 +1100
eventscripts: Improve readability of NAT gateway update code
Put the code into a couple of usefully named functions.
Signed-off-by: Martin Schwenke <mar...@meltin.net>
(Imported from commit 0953f5799c8545d9afee27d2350f344f2480df02)
commit 2ed1f247186e27ace5d082ae5df324a0072b244b
Author: Martin Schwenke <mar...@meltin.net>
Date: Fri Mar 14 16:29:01 2014 +1100
tests: Add some tests for 11.natgw eventscript
This includes adding support for:
* Configuring fake NATGW state in the eventscript unit tests
* "natgwlist" and "setnatgwstate" in ctdb command stub
* ip command stub to default to "main table" when no table specified,
allow routes to be added without "dev" option (just add a default
dev), support "metric" option
Signed-off-by: Martin Schwenke <mar...@meltin.net>
(Imported from commit 7fdd6b7861a4767cd3e2dfa76a7d7e7790efd840)
commit e5af4b517b7ad3f9e75f8c4b14c551d11116eaf6
Author: Martin Schwenke <mar...@meltin.net>
Date: Fri Mar 7 13:37:21 2014 +1100
eventscripts: Use set_proc() to update /proc
In case we want to write some unit tests in the future.
Signed-off-by: Martin Schwenke <mar...@meltin.net>
(Imported from commit feeb9843bf46d00beb10f3e959ba0f73f5e33e8c)
commit a150d068c07d5014582b56da089a658b3b7d74e6
Author: Amitay Isaacs <ami...@gmail.com>
Date: Mon Mar 31 13:26:57 2014 +1100
Revert "eventscripts: Use set_proc() to update /proc"
This reverts commit 6587dc06cc5b697289af3888cd94a5c6d1e5ce8e.
Wrong imported commit information.
commit 70404637614154fd27ca053cedeb3ab3b5ef1340
Author: Amitay Isaacs <ami...@gmail.com>
Date: Mon Mar 31 13:26:47 2014 +1100
Revert "tests: Add some tests for 11.natgw eventscript"
This reverts commit 62268bf277dad3d79e33bc88d51dffc53a3a873d.
Wrong imported commit information.
commit dad2bf3de71ed31a5c754e81abbee48c54aabae7
Author: Amitay Isaacs <ami...@gmail.com>
Date: Mon Mar 31 13:26:28 2014 +1100
Revert "eventscripts: Improve readability of NAT gateway update code"
This reverts commit e046b625e0f1461bfa84972f0b981111fce725bb.
Wrong imported commit information.
commit 1539157241d485343339877c5cbf83266b1e6c5e
Author: Amitay Isaacs <ami...@gmail.com>
Date: Mon Mar 31 13:26:17 2014 +1100
Revert "eventscripts: Sanity check NAT gateway configuration"
This reverts commit a15fbcc26c9b1753a525694c318d8f77c0f38dfa.
Wrong imported commit information.
commit 27f0500629d2e51a39c9f195e5fa43eaf84587d5
Author: Amitay Isaacs <ami...@gmail.com>
Date: Mon Mar 31 13:26:04 2014 +1100
Revert "tests: Add a test for NAT gateway sanity checking"
This reverts commit f4bd0dca4ad63268203ef123bcd1287a38583844.
Wrong imported commit information.
commit c895fc4608b25743c15cce258b204d51e446965d
Author: Amitay Isaacs <ami...@gmail.com>
Date: Mon Mar 31 13:25:54 2014 +1100
Revert "eventscripts: Rename some NAT gateway functions"
This reverts commit 8909030c2559b0e627db83937580d2fbf1227247.
Wrong imported commit information.
commit 6621175edaef39405076bae866cc865b90c3dd9a
Author: Amitay Isaacs <ami...@gmail.com>
Date: Mon Mar 31 13:25:43 2014 +1100
Revert "eventscripts: Reformat natgw_clear()"
This reverts commit 41b630097d0cabfe32bd2b3cf9cbcae9aeff5c5f.
Wrong imported commit information.
commit ed05af69cdb316baacafb8b525a62acd425c35eb
Author: Amitay Isaacs <ami...@gmail.com>
Date: Mon Mar 31 13:25:34 2014 +1100
Revert "eventscripts: Improve check in NATGW "startup" event"
This reverts commit 2d616266a221e54019eaf09ff5276c2c455bbf57.
Wrong imported commit information.
commit b1705d520d970dba4c3c02048de8847d0a54246d
Author: Amitay Isaacs <ami...@gmail.com>
Date: Mon Mar 31 13:25:25 2014 +1100
Revert "eventscripts: Clarify that CTDB_NATGW_DEFAULT_GATEWAY is optional"
This reverts commit a4ff3c748d253162289f95c3fe94e935f8acc48f.
Wrong imported commit information.
commit ce9041f9ae0df8075d96fce6afa20a7ba6df598f
Author: Amitay Isaacs <ami...@gmail.com>
Date: Mon Mar 31 13:25:11 2014 +1100
Revert "eventscripts: New configuration variable CTDB_NATGW_STATIC_ROUTES"
This reverts commit ceea3beb65e524bc864ea17940bb846b28b302e3.
Wrong imported commit information.
commit c8970d026dbc42a4e75649bc52aa078442a5fc5b
Author: Amitay Isaacs <ami...@gmail.com>
Date: Mon Mar 31 13:25:00 2014 +1100
Revert "eventscripts: CTDB_NATGW_STATIC_ROUTES can specify gateways"
This reverts commit 12ec379d6cfd58dc2416f9e212973ef04a2326e6.
Wrong imported commit information.
commit 8ad53592764893ce00d583efcaafbd4cbbfdac13
Author: Amitay Isaacs <ami...@gmail.com>
Date: Mon Mar 31 13:24:35 2014 +1100
Revert "tests: Add NAT gateway eventscript unit tests for static routes"
This reverts commit ce7e1cecb831e9eb1c994aa4b86ce13299af436f.
Wrong import commit information.
-----------------------------------------------------------------------
Summary of changes:
tests/eventscripts/11.natgw.002.sh | 1 +
tests/eventscripts/11.natgw.015.sh | 1 +
tests/eventscripts/11.natgw.025.sh | 1 +
3 files changed, 3 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/tests/eventscripts/11.natgw.002.sh
b/tests/eventscripts/11.natgw.002.sh
index 8dbeeee..e496e4a 100755
--- a/tests/eventscripts/11.natgw.002.sh
+++ b/tests/eventscripts/11.natgw.002.sh
@@ -21,3 +21,4 @@ EOF
for i in "startup" "ipreallocated" "monitor" ; do
simple_test_event "$i"
done
+
diff --git a/tests/eventscripts/11.natgw.015.sh
b/tests/eventscripts/11.natgw.015.sh
index 691b363..d202ae6 100755
--- a/tests/eventscripts/11.natgw.015.sh
+++ b/tests/eventscripts/11.natgw.015.sh
@@ -59,3 +59,4 @@ simple_test_command ip route show
ok_natgw_master_ip_addr_show
simple_test_command ip addr show "$CTDB_NATGW_PUBLIC_IFACE"
+
diff --git a/tests/eventscripts/11.natgw.025.sh
b/tests/eventscripts/11.natgw.025.sh
index b973fe0..60602d3 100755
--- a/tests/eventscripts/11.natgw.025.sh
+++ b/tests/eventscripts/11.natgw.025.sh
@@ -61,3 +61,4 @@ simple_test_command ip route show
ok_natgw_master_ip_addr_show
simple_test_command ip addr show "$CTDB_NATGW_PUBLIC_IFACE"
+
--
CTDB repository
