7d1e81e853
* debian/patches/acceptance_tests_coverage_binary.patch: Likewise. * debian/patches/automatic_primary_reinit.patch: Likewise. * debian/patches/automatic_primary_reinit.patch: Likewise. * debian/patches/patronictl_timeline_info.patch: Likewise. * debian/patches/acceptance_tests_postgres_port.patch: Likewise. * debian/patches/fix_replication_connection.patch: Likewise. * debian/patches/consul_import.patch: Refreshed.
23 lines
741 B
Diff
23 lines
741 B
Diff
Move consul import to ConsulController class
|
|
|
|
Facilitates building on stretch where this module is not available
|
|
|
|
Index: patroni/features/environment.py
|
|
===================================================================
|
|
--- patroni.orig/features/environment.py
|
|
+++ patroni/features/environment.py
|
|
@@ -1,5 +1,4 @@
|
|
import abc
|
|
-import consul
|
|
import datetime
|
|
import etcd
|
|
import kazoo.client
|
|
@@ -372,6 +371,7 @@ class AbstractDcsController(AbstractCont
|
|
class ConsulController(AbstractDcsController):
|
|
|
|
def __init__(self, context):
|
|
+ import consul
|
|
super(ConsulController, self).__init__(context)
|
|
os.environ['PATRONI_CONSUL_HOST'] = 'localhost:8500'
|
|
os.environ['PATRONI_CONSUL_REGISTER_SERVICE'] = 'on'
|