diff --git a/ansible/roles/conductor/tasks/main.yaml b/ansible/roles/conductor/tasks/main.yaml index 8b84054..64f6616 100644 --- a/ansible/roles/conductor/tasks/main.yaml +++ b/ansible/roles/conductor/tasks/main.yaml @@ -4,12 +4,9 @@ src: templates/conductor-swarm.yaml.j2 dest: "{{ target_path }}/conductor-swarm.yaml" -- name: Prepare seeds variable reading generated file lines - debug: msg="{{item}}" - loop: "{{ lookup('file', '{{ target_path}}/seeds.list').splitlines() }}" - register: seeds - - name: Generate conductor config from seeds + vars: + seeds: "{{ lookup('file', '{{ target_path}}/seeds.list').splitlines() }}" template: src: "templates/{{ conductor_config_template }}" dest: "{{ target_path }}/{{ conductor_config }}" diff --git a/ansible/roles/conductor/templates/conductor-swarm-config.properties.j2 b/ansible/roles/conductor/templates/conductor-swarm-config.properties.j2 index ec2f0f3..397fcc9 100644 --- a/ansible/roles/conductor/templates/conductor-swarm-config.properties.j2 +++ b/ansible/roles/conductor/templates/conductor-swarm-config.properties.j2 @@ -17,8 +17,8 @@ workflow.dynomite.cluster.hosts={% set ns = namespace() %} {% set ns.datacenter = "us-east-" %} {% set ns.current_rack = "" %} {% set ns.current_suffix = 0 %} -{% for seed in seeds.results %} -{% set ns.seed_tokens = seed.msg.split(':') %} +{% for seed in seeds %} +{% set ns.seed_tokens = seed.split(':') %} {% if ns.seed_tokens[2] != ns.current_rack %} {% set ns.current_rack = ns.seed_tokens[2] %} {% set ns.current_suffix = ns.current_suffix + 1 %} diff --git a/ansible/roles/dynomite/tasks/main.yaml b/ansible/roles/dynomite/tasks/main.yaml index bdd3ac6..b9ccf82 100644 --- a/ansible/roles/dynomite/tasks/main.yaml +++ b/ansible/roles/dynomite/tasks/main.yaml @@ -4,12 +4,9 @@ src: templates/seeds.list.j2 dest: "{{ target_path }}/seeds.list" -- name: Prepare seeds variable reading generated file lines - debug: msg="{{item}}" - loop: "{{ lookup('file', '{{ target_path}}/seeds.list').splitlines() }}" - register: seeds - - name: Generate dynomite-swarm + vars: + seeds: "{{ lookup('file', '{{ target_path}}/seeds.list').splitlines() }}" template: src: templates/dynomite-swarm.yaml.j2 dest: "{{ target_path }}/dynomite-swarm.yaml" diff --git a/ansible/roles/dynomite/templates/dynomite-service.yaml.j2 b/ansible/roles/dynomite/templates/dynomite-service.yaml.j2 index a3fed8b..3a8e61b 100644 --- a/ansible/roles/dynomite/templates/dynomite-service.yaml.j2 +++ b/ansible/roles/dynomite/templates/dynomite-service.yaml.j2 @@ -1,8 +1,8 @@ - {% for seed in seeds.results %} - {{ seed.msg.split(':')[0] }}: + {% for seed in seeds %} + {{ seed.split(':')[0] }}: environment: - - DYNO_NODE={{ seed.msg }} + - DYNO_NODE={{ seed }} image: nubisware/autodynomite:latest networks: {{ conductor_network }}: