diff --git a/control_plane/input_params/login_vars.yml b/control_plane/input_params/login_vars.yml index 940ce8d0cc..1fe6488dd3 100644 --- a/control_plane/input_params/login_vars.yml +++ b/control_plane/input_params/login_vars.yml @@ -51,13 +51,14 @@ idrac_password: "" ### Usage: webui_grafana ### # The username for grafana UI -# The length of username should be atleast 6 +# The length of username should be at least 5 # The username must not contain -,\, '," grafana_username: "" # Password used for grafana UI -# The length of the password should be at least 6 +# The length of the password should be at least 5 # The password must not contain -,\, '," +# The password should not be kept 'admin' grafana_password: "" ### Usage: network_ethernet ### diff --git a/control_plane/roles/control_plane_common/tasks/password_config.yml b/control_plane/roles/control_plane_common/tasks/password_config.yml index 689ab83a4c..0ddb3a7e8e 100644 --- a/control_plane/roles/control_plane_common/tasks/password_config.yml +++ b/control_plane/roles/control_plane_common/tasks/password_config.yml @@ -118,6 +118,7 @@ - " \"'\" not in grafana_username " - grafana_password | length >= min_length_grafana - grafana_password | length <= max_length + - not grafana_password == 'admin' - '"-" not in grafana_password ' - '"\\" not in grafana_password ' - '"\"" not in grafana_password ' diff --git a/control_plane/roles/control_plane_common/vars/main.yml b/control_plane/roles/control_plane_common/vars/main.yml index c3a929175d..af6dd42f7b 100644 --- a/control_plane/roles/control_plane_common/vars/main.yml +++ b/control_plane/roles/control_plane_common/vars/main.yml @@ -79,7 +79,7 @@ vault_filename: input_params/.login_vault_key min_length: 8 max_length: 30 min_username_length: 4 -min_length_grafana: 6 +min_length_grafana: 5 file_perm: '0755' vault_file_perm: '0644' mount_dir_perm: '0775' diff --git a/control_plane/roles/webui_grafana/tasks/pre-requisites.yml b/control_plane/roles/webui_grafana/tasks/pre-requisites.yml index fa66572850..403b7fd284 100644 --- a/control_plane/roles/webui_grafana/tasks/pre-requisites.yml +++ b/control_plane/roles/webui_grafana/tasks/pre-requisites.yml @@ -17,6 +17,12 @@ command: ansible-galaxy collection install "{{ item }}" with_items: "{{ collections_name }}" changed_when: false + +- name: Install openshift using pip3 + pip: + name: openshift + state: present + executable: pip3 - name: Create grafana namespace kubernetes.core.k8s: diff --git a/telemetry/roles/common/tasks/validate_login_vars.yml b/telemetry/roles/common/tasks/validate_login_vars.yml index 3093843f2f..c2d9463c0d 100644 --- a/telemetry/roles/common/tasks/validate_login_vars.yml +++ b/telemetry/roles/common/tasks/validate_login_vars.yml @@ -140,6 +140,7 @@ - " \"'\" not in grafana_username " - grafana_password | length >= min_length_grafana - grafana_password | length <= max_length + - not grafana_password == 'admin' - '"-" not in grafana_password ' - '"\\" not in grafana_password ' - '"\"" not in grafana_password ' diff --git a/telemetry/roles/common/vars/main.yml b/telemetry/roles/common/vars/main.yml index 5bd9fec4c0..5a0d22b19e 100644 --- a/telemetry/roles/common/vars/main.yml +++ b/telemetry/roles/common/vars/main.yml @@ -51,7 +51,7 @@ vault_filename: "{{ role_path }}/../../input_params/.login_vault_key" login_vars_fail_msg: "Usernames and passwords in input_params/login_vars.yml should have minimum length 2" ctrl_plane_login_vault_filename: "{{ role_path }}/../../../control_plane/input_params/.login_vault_key" -min_length_grafana: 6 +min_length_grafana: 5 max_length: 30 ctrl_plane_login_vars_fail_msg: "Incorrect grafana_username or grafana_password format provided in control_plane/login_vars.yml"