From b5614dfee0a0580973f2accc66a9573262c86d3a Mon Sep 17 00:00:00 2001 From: Bertrand Lanson Date: Fri, 3 May 2024 22:31:38 +0200 Subject: [PATCH] fix: various fixes to accomodate the new pre-generated credentials --- playbooks/preflight.yml | 3 --- playbooks/tasks/haproxy/haproxy_deploy.yml | 7 +------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/playbooks/preflight.yml b/playbooks/preflight.yml index c826b15..0ec807e 100644 --- a/playbooks/preflight.yml +++ b/playbooks/preflight.yml @@ -305,6 +305,3 @@ fail_msg: >- The python sdk for docker is really out of date, you need to install a more recent version of it in order to use this tool. - - # - name: "Fail" - # fail: diff --git a/playbooks/tasks/haproxy/haproxy_deploy.yml b/playbooks/tasks/haproxy/haproxy_deploy.yml index 9b1a998..656aa5c 100644 --- a/playbooks/tasks/haproxy/haproxy_deploy.yml +++ b/playbooks/tasks/haproxy/haproxy_deploy.yml @@ -12,14 +12,9 @@ - name: "Register haproxy services in consul" when: enable_consul | bool block: - - name: "Load consul cluster variables" - ansible.builtin.include_vars: - file: "{{ sub_configuration_directories.consul_servers }}/consul_config.yml" - name: _consul_cluster_config - - name: "Register haproxy services in consul" community.general.consul: - token: "{{ _consul_cluster_config.root_token.secret_id }}" + token: "{{ _credentials.consul.root_token.secret_id }}" service_name: haproxy service_port: 80 interval: 20s