Commit edd6954b authored by Hilal Ozdemir's avatar Hilal Ozdemir

move dns and zeroconf plugins into discovery folder

parent 312a8d06
......@@ -366,7 +366,7 @@ class Config(metaclass=ConfigMeta):
Tries first read from environment variable `BEIRAN_PLUGINS` which contains
a comma separated string of plugin list::
"beiran.plugins.discovery_dns,beiran.plugins.discovery_zeroconf,package.docker"
"beiran.plugins.discovery.dns,beiran.plugins.discovery.zeroconf,package.docker"
If `BEIRAN_PLUGINS` is not specified, then tries getting plugins from config file.
"""
......@@ -377,8 +377,7 @@ class Config(metaclass=ConfigMeta):
try:
for p_package in env_plugins.split(','):
if p_package.startswith("beiran.plugins"):
_, _, type_name = p_package.split('.')
p_type, p_name = type_name.split('_')
_, _, p_type, p_name = p_package.split('.')
module_path = p_package
else:
p_type, p_name = p_package.split('.')
......
......@@ -21,9 +21,9 @@ module_path = 'beiran_package_docker'
# dns discovery settings
[discovery.dns]
enabled = true
module_path = 'beiran.plugins.discovery_dns'
module_path = 'beiran.plugins.discovery.dns'
# zeroconf discovery settings
[discovery.zeroconf]
enabled = true
module_path = 'beiran.plugins.discovery_zeroconf'
\ No newline at end of file
module_path = 'beiran.plugins.discovery.zeroconf'
\ No newline at end of file
......@@ -23,7 +23,7 @@ services:
network_mode: "service:pod1"
environment:
- BEIRAN_DISCOVERY_METHOD=zeroconf
- BEIRAN_PLUGINS=beiran.plugins.discovery_zeroconf,package.docker
- BEIRAN_PLUGINS=beiran.plugins.discovery.zeroconf,package.docker
- BEIRAN_LISTEN_ADDRESS=0.0.0.0
......@@ -50,7 +50,7 @@ services:
network_mode: "service:pod2"
environment:
- BEIRAN_DISCOVERY_METHOD=zeroconf
- BEIRAN_PLUGINS=beiran.plugins.discovery_zeroconf,package.docker
- BEIRAN_PLUGINS=beiran.plugins.discovery.zeroconf,package.docker
- BEIRAN_LISTEN_ADDRESS=0.0.0.0
......@@ -77,7 +77,7 @@ services:
network_mode: "service:pod3"
environment:
- BEIRAN_DISCOVERY_METHOD=zeroconf
- BEIRAN_PLUGINS=beiran.plugins.discovery_zeroconf,package.docker
- BEIRAN_PLUGINS=beiran.plugins.discovery.zeroconf,package.docker
- BEIRAN_LISTEN_ADDRESS=0.0.0.0
pod4:
......@@ -103,7 +103,7 @@ services:
network_mode: "service:pod4"
environment:
- BEIRAN_DISCOVERY_METHOD=zeroconf
- BEIRAN_PLUGINS=beiran.plugins.discovery_zeroconf,package.docker
- BEIRAN_PLUGINS=beiran.plugins.discovery.zeroconf,package.docker
- BEIRAN_LISTEN_ADDRESS=0.0.0.0
networks:
......
......@@ -24,7 +24,7 @@ services:
network_mode: "service:pod1"
environment:
- BEIRAN_DISCOVERY_METHOD=zeroconf
- BEIRAN_PLUGINS=beiran.plugins.discovery_zeroconf,package.docker
- BEIRAN_PLUGINS=beiran.plugins.discovery.zeroconf,package.docker
- BEIRAN_LISTEN_ADDRESS=0.0.0.0
pod2: *pod_tpl
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment