FIX: update config vars to v3

mdsketch · Apr 15, 2023 · 67faccb · 67faccb
1 parent 497ab41
commit 67faccb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -118,11 +118,8 @@ For example to install teleport on a node:
         v: "label_value"
     teleport_auth_token: "super secret auth token"
     teleport_ca_pin: "not as secret ca pin"
-    teleport_auth_servers:
-      - "1st auth server"
-      - "2nd auth server"
-    teleport_proxy_server:
-      - "proxy server"
+    teleport_auth_server: "auth server"
+    teleport_proxy_server: "proxy server"
 ```
 
 *Created Teleport Config to `/etc/teleport.yaml`*
@@ -133,10 +130,8 @@ version: v3
 teleport:
   auth_token: "super secret auth token"
   ca_pin: "not as secret ca pin"
-  auth_servers:
-    - "1st auth server"
-    - "2nd auth server"
-  proxy_server: ['proxy server']
+  auth_server: "auth server"
+  proxy_server: proxy server
   log:
     output: stderr
     severity: INFO

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -4,9 +4,7 @@ teleport_architecture: "amd64-bin"
 # teleport_architecture: "arm-bin"
 teleport_auth_token: ""
 teleport_ca_pin: ""
-teleport_auth_servers:
-  - "https://auth.example.com"
-  - "127.0.0.1:3025"
+teleport_auth_server: "https://auth.example.com"
 teleport_url: "https://get.gravitational.com/teleport-v{{ teleport_version }}-linux-{{ teleport_architecture }}.tar.gz"
 teleport_config_path: "/etc/teleport.yaml"
 backup_teleport_config: yes

diff --git a/templates/default_teleport.yaml.j2 b/templates/default_teleport.yaml.j2
@@ -3,10 +3,9 @@ version: v3
 teleport:
   auth_token: "{{ teleport_auth_token }}"
   ca_pin: "{{ teleport_ca_pin }}"
-  auth_servers:
-{% for auth_server in teleport_auth_servers %}
-    - "{{ auth_server }}"
-{% endfor %}
+{% if teleport_auth_server|string %}
+  auth_server: {{ teleport_auth_server }}
+{% endif %}
 {% if teleport_proxy_server|string %}
   proxy_server: {{ teleport_proxy_server }}
 {% endif %}