From 413bf12640168fd0f3bbadfeaa8253b0fbd4cb6c Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Mon, 19 Aug 2024 13:03:43 +0200 Subject: [PATCH] Switch OpenSearch and OpenSearch Dashboards to 2.13.0 The upgrade will be performed soon, so let's try run the CI tests with that version. Change-Id: I26edf3a039e24e86f0db1de6db96398691ff92b1 --- ansible/playbooks/check-services.yml | 10 ++++++---- roles/backup-dashboards-objects/tasks/main.yml | 10 +++++----- roles/check-services/tasks/opensearch.yml | 11 ++++------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/ansible/playbooks/check-services.yml b/ansible/playbooks/check-services.yml index b22bd5f..b34168a 100644 --- a/ansible/playbooks/check-services.yml +++ b/ansible/playbooks/check-services.yml @@ -2,6 +2,8 @@ - hosts: all become: true vars: + opensearch_user: admin + opensearch_pass: A!1dmiN*234#& # logscraper tenant_builds: - tenant: openstack @@ -11,16 +13,16 @@ job_names: [] download: true download_dir: /mnt/logscraper/openstack - es_username: admin - es_password: admin + es_username: "{{ opensearch_user }}" + es_password: "{{ opensearch_pass }}" es_host: localhost es_port: 9200 es_insecure: true es_index: logstash-logscraper logscraper_dir: /etc/logscraper subunit_index_prefix: "subunit-" - es_admin_username: admin - es_admin_password: admin + es_admin_username: "{{ opensearch_user }}" + es_admin_password: "{{ opensearch_pass }}" tasks: - name: Run check services include_role: diff --git a/roles/backup-dashboards-objects/tasks/main.yml b/roles/backup-dashboards-objects/tasks/main.yml index 36febde..97e8a07 100644 --- a/roles/backup-dashboards-objects/tasks/main.yml +++ b/roles/backup-dashboards-objects/tasks/main.yml @@ -5,7 +5,7 @@ podman run -d --name opensearch-dashboards --network host -e "OPENSEARCH_HOST=https://127.0.0.1:9200" - quay.io/software-factory/opensearch-dashboards:2.11.1 + quay.io/software-factory/opensearch-dashboards:2.13.0 - name: Wait for Opensearch Dashboards to be up wait_for: @@ -17,8 +17,8 @@ - name: Ensure Opensearch Dashboards to be up uri: url: "http://0.0.0.0:5601/app/login" - user: "admin" - password: "admin" + user: "{{ opensearch_user }}" + password: "{{ opensearch_pass }}" force_basic_auth: true method: GET status_code: "200" @@ -46,7 +46,7 @@ restore --dashboard-api-url http://127.0.0.1:5601 --tenant global - --user 'admin' --password 'admin' + --user "{{ opensearch_user }}" --password "{{ opensearch_pass }}" --file {{ original_backup_dir }}/{{ item }} --host 127.0.0.1 --port 9200 --insecure @@ -136,7 +136,7 @@ restore --dashboard-api-url http://127.0.0.1:5601 --tenant global - --user 'admin' --password 'admin' + --user "{{ opensearch_user }}" --password "{{ opensearch_pass }}" --file {{ original_backup_dir }}/{{ item }} --host 127.0.0.1 --port 9200 --insecure diff --git a/roles/check-services/tasks/opensearch.yml b/roles/check-services/tasks/opensearch.yml index 0af0902..d90b791 100644 --- a/roles/check-services/tasks/opensearch.yml +++ b/roles/check-services/tasks/opensearch.yml @@ -4,7 +4,8 @@ podman run -d --name opensearch \ --network host \ -e "discovery.type=single-node" \ - quay.io/software-factory/opensearch:2.11.1 + -e "OPENSEARCH_INITIAL_ADMIN_PASSWORD={{ opensearch_pass }}" \ + quay.io/software-factory/opensearch:2.13.0 - name: Wait for Opensearch to be up wait_for: @@ -16,8 +17,8 @@ - name: Wait for Opensearch to be up uri: url: "https://127.0.0.1:9200" - user: "admin" - password: "admin" + user: "{{ opensearch_user }}" + password: "{{ opensearch_pass }}" force_basic_auth: true method: GET validate_certs: false @@ -26,7 +27,3 @@ until: result.status == 200 retries: 30 delay: 10 - -- name: Reconfigure once again security plugin - shell: | - podman exec -it opensearch bash -c "JAVA_HOME=/usr/share/opensearch/jdk /usr/share/opensearch/securityadmin_demo.sh"