Merge "Fixed a potential circular dependency"
This commit is contained in:
commit
505be14630
|
@ -31,7 +31,7 @@ from designate import dnsutils
|
|||
from designate import service
|
||||
from designate.agent import handler
|
||||
from designate.backend import agent_backend
|
||||
from designate.utils import DEFAULT_AGENT_PORT
|
||||
from designate.conf.agent import DEFAULT_AGENT_PORT
|
||||
|
||||
|
||||
CONF = cfg.CONF
|
||||
|
|
|
@ -38,8 +38,8 @@ from oslo_log import log as logging
|
|||
|
||||
from designate.backend import base
|
||||
from designate import exceptions
|
||||
from designate.conf.agent import DEFAULT_AGENT_PORT
|
||||
from designate.mdns import rpcapi as mdns_api
|
||||
from designate.utils import DEFAULT_AGENT_PORT
|
||||
import designate.backend.private_codes as pcodes
|
||||
|
||||
dns_query = eventlet.import_patched('dns.query')
|
||||
|
|
|
@ -29,7 +29,7 @@ from oslo_utils import strutils
|
|||
from designate import exceptions
|
||||
from designate import utils
|
||||
from designate.backend import base
|
||||
from designate.utils import DEFAULT_MDNS_PORT
|
||||
from designate.conf.mdns import DEFAULT_MDNS_PORT
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
DEFAULT_MASTER_PORT = DEFAULT_MDNS_PORT
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
# under the License.
|
||||
from oslo_config import cfg
|
||||
|
||||
from designate.utils import DEFAULT_AGENT_PORT
|
||||
DEFAULT_AGENT_PORT = 5358
|
||||
|
||||
AGENT_GROUP = cfg.OptGroup(
|
||||
name='service:agent',
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
# under the License.
|
||||
from oslo_config import cfg
|
||||
|
||||
from designate.utils import DEFAULT_MDNS_PORT
|
||||
DEFAULT_MDNS_PORT = 5354
|
||||
|
||||
MDNS_GROUP = cfg.OptGroup(
|
||||
name='service:mdns', title="Configuration for mDNS Service"
|
||||
|
|
|
@ -20,10 +20,10 @@ from designate import dnsutils
|
|||
from designate import service
|
||||
from designate import storage
|
||||
from designate import utils
|
||||
from designate.conf.mdns import DEFAULT_MDNS_PORT
|
||||
from designate.mdns import handler
|
||||
from designate.mdns import notify
|
||||
from designate.mdns import xfr
|
||||
from designate.utils import DEFAULT_MDNS_PORT
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
CONF = cfg.CONF
|
||||
|
|
|
@ -23,9 +23,9 @@ from oslo_messaging.rpc import dispatcher as rpc_dispatcher
|
|||
|
||||
from designate import exceptions
|
||||
from designate import objects
|
||||
from designate.conf.mdns import DEFAULT_MDNS_PORT
|
||||
from designate.utils import generate_uuid
|
||||
from designate.storage.base import Storage as StorageBase
|
||||
from designate.utils import DEFAULT_MDNS_PORT
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
|
|
@ -20,9 +20,9 @@ import yaml
|
|||
from oslo_log import log as logging
|
||||
|
||||
from designate import objects
|
||||
from designate.conf.mdns import DEFAULT_MDNS_PORT
|
||||
from designate.objects import adapters
|
||||
from designate.tests import resources
|
||||
from designate.utils import DEFAULT_MDNS_PORT
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
|
@ -36,12 +36,6 @@ from designate.i18n import _
|
|||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
# Default TCP/UDP ports
|
||||
|
||||
DEFAULT_AGENT_PORT = 5358
|
||||
DEFAULT_MDNS_PORT = 5354
|
||||
|
||||
|
||||
# Default datetime format
|
||||
|
||||
DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%S.%f'
|
||||
|
|
Loading…
Reference in New Issue