瀏覽代碼

Merge branch 'devel' into omnia_changes

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

+ 1 - 1
telemetry/input_params/telemetry_login_vars.yml

@@ -20,7 +20,7 @@
 timescaledb_user: ""
 
 # Password used for connecting to timescale db
-# The password must not contain -,\, ',"
+# The password must not contain -,\, ',",@
 # The Length of the password should be at least 2 characters.
 # Mandatory field
 timescaledb_password: ""

+ 1 - 0
telemetry/roles/common/tasks/validate_login_vars.yml

@@ -51,6 +51,7 @@
         - '"\\" not in timescaledb_password '
         - '"\"" not in timescaledb_password '
         - " \"'\" not in timescaledb_password "
+        - '"@" not in timescaledb_password '
     no_log: true
 
   - name: Assert mysqldb user name

+ 1 - 1
telemetry/roles/common/vars/main.yml

@@ -57,7 +57,7 @@ mysqldb_fail_msg: "MySQL DB name should have minimum length of 2"
 
 # Usage: validate_login_vars.yml
 vault_filename: "{{ role_path }}/../../input_params/.login_vault_key"
-login_vars_fail_msg: "Usernames and passwords in input_params/telemetry_login_vars.yml should have minimum length 2"
+login_vars_fail_msg: "Username/password validation in telemetry_login_vars.yml failed. Please check the requirements."
 
 ctrl_plane_login_vault_filename: "{{ role_path }}/../../../control_plane/input_params/.login_vault_key"
 min_length_grafana: 5