Skip to content

Commit d995b92

Browse files
kedaibakhtiar.hamid
andauthored
Removed duplicates ssl config in base.hcl.j2 (#148)
* Removed duplicates ssl config in base.hcl.j2 * Removed duplicates in README.md and defaults/main.yml as mentioned by [Blefish](https://github.com/Blefish) Co-authored-by: bakhtiar.hamid <bakhtiar.hamid@paynet.my>
1 parent ae4daa1 commit d995b92

File tree

3 files changed

+0
-30
lines changed

3 files changed

+0
-30
lines changed

README.md

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -505,26 +505,6 @@ in many Ansible versions, so this feature might not always work.
505505
- Token to use for consul interaction
506506
- Default value: **""**
507507

508-
### `nomad_consul_ssl`
509-
510-
- Communicate with Consul over TLS
511-
- Default value: **false**
512-
513-
### `nomad_consul_ca_file`
514-
515-
- CA certificate used for Consul communication
516-
- Default value: **""**
517-
518-
### `nomad_consul_cert_file`
519-
520-
- Certificate used for Consul communication. Must also specify `nomad_consul_key_file`.
521-
- Default value: **""**
522-
523-
### `nomad_consul_key_file`
524-
525-
- Private key used for Consul communication.
526-
- Default value: **""**
527-
528508
### `nomad_bootstrap_expect`
529509

530510
- Specifies the number of server nodes to wait for before bootstrapping.

defaults/main.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,6 @@ nomad_consul_token: ""
161161
nomad_consul_servers_service_name: "nomad-servers"
162162
nomad_consul_clients_service_name: "nomad-clients"
163163
nomad_consul_tags: {}
164-
nomad_consul_ssl: false
165-
nomad_consul_ca_file: ""
166-
nomad_consul_cert_file: ""
167-
nomad_consul_key_file: ""
168164

169165
### ACLs
170166
nomad_acl_enabled: "{{ lookup('env', 'NOMAD_ACL_ENABLED') | default('no', true) }}"

templates/base.hcl.j2

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ consul {
3838
# Enabling the server and client to bootstrap using Consul.
3939
server_auto_join = true
4040
client_auto_join = true
41-
42-
# Nomad to Consul TLS configuration
43-
ssl = {{ nomad_consul_ssl | bool | lower }}
44-
ca_file = "{{ nomad_consul_ca_file }}"
45-
cert_file = "{{ nomad_consul_cert_file }}"
46-
key_file = "{{ nomad_consul_key_file }}"
4741
}
4842
{% endif %}
4943

0 commit comments

Comments
 (0)