Skip to content

Commit bc37064

Browse files
committed
Code review tweaks
1 parent 15d3514 commit bc37064

File tree

4 files changed

+3
-15
lines changed

4 files changed

+3
-15
lines changed

ansible/roles/k3s/files/start_k3s.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
service_name: "{{ 'k3s-agent' if k3s_server_name is defined else 'k3s' }}"
88
tasks:
99
- name: Add the token for joining the cluster to the environment
10-
no_log: false # avoid logging the server token
10+
no_log: true # avoid logging the server token
1111
ansible.builtin.lineinfile:
1212
path: "/etc/systemd/system/{{ service_name }}.service.env"
1313
line: "K3S_TOKEN={{ k3s_token }}"

ansible/roles/passwords/tasks/main.yml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,7 @@
99

1010
- name: Template k3s token to terraform
1111
template:
12-
src: k3s-token.auto.tfvars.json
12+
src: k3s-token.auto.tfvars.json.j2
1313
dest: "{{ lookup('env', 'APPLIANCES_ENVIRONMENT_ROOT') }}/terraform/k3s-token.auto.tfvars.json"
1414
delegate_to: localhost
1515
run_once: true
16-
17-
18-
# - name: Ensure munge key directory exists
19-
# file:
20-
# state: directory
21-
# recurse: true
22-
# path: "{{ openhpc_passwords_mungekey_output_path | dirname }}"
23-
24-
# - name: Create a munge key
25-
# copy:
26-
# content: "{{ lookup('password', '/dev/null chars=ascii_letters,digits,hexdigits,punctuation') }}"
27-
# dest: "{{ openhpc_passwords_mungekey_output_path }}"
28-
# force: false
File renamed without changes.

environments/skeleton/{{cookiecutter.environment}}/terraform/variables.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,5 +133,6 @@ variable "root_volume_size" {
133133
}
134134

135135
variable "k3s_token" {
136+
description = "K3s cluster authentication token, set automatically by Ansible"
136137
type = string
137138
}

0 commit comments

Comments
 (0)