Merge branch 'multidcs' of github.com:CyberDem0n/governor into feature/multidcs

Conflicts: governor.py tests/test_governor.py tests/test_postgresql.py
2026-08-25 14:53:37 +00:00 · 2015-07-08 08:47:26 +02:00
parent c7210d35ff 43b12af3a7
commit 54400c6dec
16 changed files with 510 additions and 132 deletions
@@ -1,12 +1,18 @@
-loop_wait: 10
+ttl: &ttl 30
+loop_wait: &loop_wait 10
 restapi:
  listen: 127.0.0.1:8008
  connect_address: 127.0.0.1:8008
 etcd:
  scope: batman
-  ttl: 30
+  ttl: *ttl
  host: 127.0.0.1:4001
  #discovery_srv: my-etcd.domain
+#zookeeper:
+#  scope: batman
+#  session_timeout: *ttl
+#  reconnect_timeout: *loop_wait
+#  hosts: 127.0.0.1:2181
 postgresql:
  name: postgresql0
  listen: 127.0.0.1:5432