瀏覽代碼

Merge branch 'devel' into control_plane_tag

Sujit Jadhav 3 年之前
父節點
當前提交
8c0045a4a4

+ 2 - 2
control_plane/tools/roles/cluster_preperation/tasks/passwordless_ssh.yml

@@ -49,7 +49,7 @@
   ansible.builtin.file:
     path: "{{ rsa_id_file }}"
     state: touch
-    mode: "{{ file_mode }}"
+    mode: "{{ ssh_file_mode }}"
   when:
     - not ssh_status
     - not verify_rsa_id_file.stat.exists
@@ -65,7 +65,7 @@
     content: |
       Host *
           IdentityFile "{{ rsa_id_file }}"
-    mode: "{{ file_mode }}"
+    mode: "{{ ssh_file_mode }}"
 
 - name: Add the key identity
   shell: |

+ 1 - 1
control_plane/tools/roles/cluster_preperation/vars/main.yml

@@ -18,4 +18,4 @@ rsa_id_file: "/root/.ssh/id_rsa"
 passphrase: ""
 auth_key_path: "/root/.ssh/authorized_keys"
 config_file: "/root/.ssh/config"
-file_mode: "0600"
+ssh_file_mode: "0600"

+ 1 - 1
telemetry/roles/grafana_config/files/parallel-coordinate.json

@@ -328,7 +328,7 @@
   "timepicker": {},
   "timezone": "browser",
   "title": "Parallel-Coordinate",
-  "uid": "pArBHUtnk",
+  "uid": "pArBHUtvm",
   "version": 10,
   "weekStart": ""
 }