From 1c8923fa5209aaacc5dc5f286d718dcda507d138 Mon Sep 17 00:00:00 2001 From: Anton Podviaznikov Date: Mon, 18 Jan 2016 17:50:21 -0800 Subject: [PATCH 1/2] add swarm config to sauron --- ansible/group_vars/alpha-sauron.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ansible/group_vars/alpha-sauron.yml b/ansible/group_vars/alpha-sauron.yml index 60da0c0a..b109cf66 100644 --- a/ansible/group_vars/alpha-sauron.yml +++ b/ansible/group_vars/alpha-sauron.yml @@ -30,6 +30,8 @@ container_envs: > -e RABBITMQ_PORT="{{ rabbit_port }}" -e RABBITMQ_USERNAME="{{ rabbit_username }}" -e WEAVE_PATH={{ weave_path }} + -e SWARM_HOSTNAME={{ swarm_host_address }} + -e SWARM_PORT={{ swarm_master_port }} container_run_opts: > -h {{ name }} From 71deef92cb687570179d572042868fd835c28f94 Mon Sep 17 00:00:00 2001 From: Anton Podviaznikov Date: Tue, 19 Jan 2016 15:53:04 -0800 Subject: [PATCH 2/2] ordering --- ansible/group_vars/alpha-sauron.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/alpha-sauron.yml b/ansible/group_vars/alpha-sauron.yml index b109cf66..a7f1e32a 100644 --- a/ansible/group_vars/alpha-sauron.yml +++ b/ansible/group_vars/alpha-sauron.yml @@ -29,9 +29,9 @@ container_envs: > -e RABBITMQ_PASSWORD="{{ rabbit_password }}" -e RABBITMQ_PORT="{{ rabbit_port }}" -e RABBITMQ_USERNAME="{{ rabbit_username }}" - -e WEAVE_PATH={{ weave_path }} -e SWARM_HOSTNAME={{ swarm_host_address }} -e SWARM_PORT={{ swarm_master_port }} + -e WEAVE_PATH={{ weave_path }} container_run_opts: > -h {{ name }}