use geth_cont_name for Consul service name

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2021-03-25 13:50:04 +01:00
parent c5ef3a4f2d
commit 1db9eb2f6c
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
1 changed files with 6 additions and 6 deletions

View File

@ -18,9 +18,9 @@
- name: Geth | Create Consul service definition - name: Geth | Create Consul service definition
include_role: name=consul-service include_role: name=consul-service
vars: vars:
consul_config_name: '{{ geth_service_name | replace("-", "_") }}' consul_config_name: '{{ geth_cont_name }}'
consul_services: consul_services:
- name: '{{ geth_service_name }}' - name: '{{ geth_cont_name }}'
tags: '{{ geth_consul_tags }}' tags: '{{ geth_consul_tags }}'
port: '{{ geth_port }}' port: '{{ geth_port }}'
address: '{{ ansible_host }}' address: '{{ ansible_host }}'
@ -30,11 +30,11 @@
node_addr: '{{ node_info.json.result.id }}' node_addr: '{{ node_info.json.result.id }}'
node_enode: '{{ node_info.json.result.enode }}' node_enode: '{{ node_info.json.result.enode }}'
checks: checks:
- id: '{{ geth_service_name }}-status' - id: '{{ geth_cont_name }}-status'
type: tcp type: tcp
tcp: '127.0.0.1:{{ geth_port }}' tcp: '127.0.0.1:{{ geth_port }}'
- name: '{{ geth_service_name }}-rpc' - name: '{{ geth_cont_name }}-rpc'
tags: '{{ geth_consul_tags + ["rpc"] }}' tags: '{{ geth_consul_tags + ["rpc"] }}'
port: '{{ geth_rpc_port }}' port: '{{ geth_rpc_port }}'
address: '{{ ansible_local.tinc.vpn_ip }}' address: '{{ ansible_local.tinc.vpn_ip }}'
@ -42,12 +42,12 @@
env: '{{ env }}' env: '{{ env }}'
stage: '{{ stage }}' stage: '{{ stage }}'
checks: checks:
- id: '{{ geth_service_name }}-rpc-status' - id: '{{ geth_cont_name }}-rpc-status'
type: script type: script
script: '{{ geth_sync_check_script }}' script: '{{ geth_sync_check_script }}'
timeout: '5s' timeout: '5s'
- name: '{{ geth_service_name }}-ws' - name: '{{ geth_cont_name }}-ws'
tags: '{{ geth_consul_tags + ["websocket"] }}' tags: '{{ geth_consul_tags + ["websocket"] }}'
port: '{{ geth_websocket_port }}' port: '{{ geth_websocket_port }}'
address: '{{ ansible_local.tinc.vpn_ip }}' address: '{{ ansible_local.tinc.vpn_ip }}'