diff options
author | WuKong <rebirthmonkey@gmail.com> | 2017-07-18 17:55:10 +0200 |
---|---|---|
committer | WuKong <rebirthmonkey@gmail.com> | 2017-07-18 17:55:10 +0200 |
commit | 0d497bd3ac571c55d578faf21a5370e6cbf3edc9 (patch) | |
tree | d7ef8d7152b984c90754175a5f4089bad44b76cc /moonv4/moon_orchestrator | |
parent | 5cc39c4b3a2de6d670f357ed3329a4d6587c7fc7 (diff) |
review moonv4
Change-Id: Iaadd2d24871ebca3e8ba741ae21d2c0dc2d6879a
Signed-off-by: WuKong <rebirthmonkey@gmail.com>
Diffstat (limited to 'moonv4/moon_orchestrator')
-rw-r--r-- | moonv4/moon_orchestrator/moon_orchestrator/dockers.py | 1 | ||||
-rw-r--r-- | moonv4/moon_orchestrator/moon_orchestrator/server.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/moonv4/moon_orchestrator/moon_orchestrator/dockers.py b/moonv4/moon_orchestrator/moon_orchestrator/dockers.py index 0b53de96..3a754ea3 100644 --- a/moonv4/moon_orchestrator/moon_orchestrator/dockers.py +++ b/moonv4/moon_orchestrator/moon_orchestrator/dockers.py @@ -98,6 +98,7 @@ RUN pip3 install --upgrade . shutil.copy(_file, os.path.join(self.tmp_dir, "dist")) try: + # TODO: check the symbol link shutil.copytree(os.path.dirname(self.conf_file), os.path.join(self.tmp_dir, "conf")) except OSError as exc: if exc.errno == errno.ENOTDIR: diff --git a/moonv4/moon_orchestrator/moon_orchestrator/server.py b/moonv4/moon_orchestrator/moon_orchestrator/server.py index c9629c61..c5a7d79b 100644 --- a/moonv4/moon_orchestrator/moon_orchestrator/server.py +++ b/moonv4/moon_orchestrator/moon_orchestrator/server.py @@ -123,7 +123,7 @@ def server(): network_config = create_docker_network() - LOG.info("Creating Security Router") + LOG.info("Creating Router") router = SecurityRouter(options.filename, docker=docker, network_config=network_config) CONTAINERS[router.id] = router @@ -131,7 +131,7 @@ def server(): manager = SecurityManager(options.filename, docker=docker, network_config=network_config) CONTAINERS[manager.id] = manager - LOG.info("Creating Security Interface") + LOG.info("Creating Interface") interface = SecurityInterface(options.filename, docker=docker, network_config=network_config) CONTAINERS[interface.id] = interface |