From 9c2cfc241ed5523b38f9bc6677054e1b93938655 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Mon, 8 Jun 2015 20:29:42 +0000 Subject: [PATCH 1/2] wip --- .../connect-services.py => connect-services.py | 11 ++++++++--- .../unlink-services.py => unlink-services.py | 0 2 files changed, 8 insertions(+), 3 deletions(-) rename link-with-netns/connect-services.py => connect-services.py (83%) rename link-with-netns/unlink-services.py => unlink-services.py (100%) diff --git a/link-with-netns/connect-services.py b/connect-services.py similarity index 83% rename from link-with-netns/connect-services.py rename to connect-services.py index 277399e0..c3736ab1 100755 --- a/link-with-netns/connect-services.py +++ b/connect-services.py @@ -35,7 +35,7 @@ for service_name, service in stack.items(): extra_hosts = service.get("extra_hosts", {}) for link_name, link_addr in extra_hosts.items(): if link_name not in ports: - print("Skipping link {} in service {} " + print("# Skipping link {} in service {} " "(no port mapping defined). " "Your code will probably break." .format(link, service_name)) @@ -47,8 +47,6 @@ for service_name, service in stack.items(): ["docker", "port", container_name, port] ) endpoints.append(endpoint.strip()) - print("Endpoints found for {}->{}:".format(service_name, link_name)) - print(endpoints) for container_name in service_instances[service_name]: ambassador = {} ambassador["image"] = "jpetazzo/hamba" @@ -61,6 +59,13 @@ for service_name, service in stack.items(): ambassador["name"] = "amba{}".format(n) ambassadors.append(ambassador) +for service_name, container_names in service_instances.items(): + for container_name in container_names: + extra_hosts = service.get("extra_hosts", {}) + for link_name, link_addr in extra_hosts.items(): + print("docker exec {} sh -c 'echo {} {} >> /etc/hosts'" + .format(container_name, link_addr, link_name)) + for amba in ambassadors: print("docker run -d --name {name} --net {net} {image} {command}".format(**amba)) diff --git a/link-with-netns/unlink-services.py b/unlink-services.py similarity index 100% rename from link-with-netns/unlink-services.py rename to unlink-services.py From d91c9e064ee7afd687b0f5a97562be101cc0fdbc Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Mon, 8 Jun 2015 20:53:10 +0000 Subject: [PATCH 2/2] wip --- connect-services.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/connect-services.py b/connect-services.py index c3736ab1..41cd57cb 100755 --- a/connect-services.py +++ b/connect-services.py @@ -59,8 +59,8 @@ for service_name, service in stack.items(): ambassador["name"] = "amba{}".format(n) ambassadors.append(ambassador) -for service_name, container_names in service_instances.items(): - for container_name in container_names: +for service_name, service in stack.items(): + for container_name in service_instances[service_name]: extra_hosts = service.get("extra_hosts", {}) for link_name, link_addr in extra_hosts.items(): print("docker exec {} sh -c 'echo {} {} >> /etc/hosts'"