Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions control_plane/input_params/login_vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ###
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 '
Expand Down
2 changes: 1 addition & 1 deletion control_plane/roles/control_plane_common/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 6 additions & 0 deletions control_plane/roles/webui_grafana/tasks/pre-requisites.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions telemetry/roles/common/tasks/validate_login_vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 '
Expand Down
2 changes: 1 addition & 1 deletion telemetry/roles/common/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down