From 6ab159d96017574919e3d47b39bb1eb045ab52b3 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Fri, 15 Dec 2023 12:49:08 +0100 Subject: [PATCH 1/2] use ark repos for R9 opensearch builds --- etc/kayobe/environments/ci-builder/stackhpc-ci.yml | 2 ++ etc/kayobe/kolla.yml | 6 ++++++ etc/kayobe/pulp-repo-versions.yml | 2 ++ etc/kayobe/pulp.yml | 12 ++++++++++++ etc/kayobe/stackhpc.yml | 8 ++++++++ 5 files changed, 30 insertions(+) diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml index 79ea4a7f8..efe4236e9 100644 --- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml @@ -80,6 +80,8 @@ stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_pulp_repo_rhel_9_treas stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_6_version }}" stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_rhel_9_influxdb_version }}" stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_epel_9_version }}" +stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_pulp_repo_opensearch_2_x_version }}" +stackhpc_repo_opensearch_dashboards_2_x_version: "{{ stackhpc_pulp_repo_opensearch_dashboards_2_x_version }}" ## Use derived vars from etc/kayobe/pulp.yml to switch between ## minor Rocky versions using stackhpc_pulp_repo_rocky_x_minor_version stackhpc_repo_rocky_baseos_version: "{{ stackhpc_pulp_repo_rocky_8_baseos_version }}" diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 1f975c609..082e9243b 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -268,6 +268,12 @@ stackhpc_rocky_9_third_party_repos: - url: "{{ stackhpc_repo_rabbitmq_server_url }}" file: "rabbitmq_rabbitmq-server.repo" tag: "rabbitmq_rabbitmq-server" + - url: "{{ stackhpc_repo_opensearch_2_x_url }}" + file: "opensearch.repo" + tag: "opensearch-2.x" + - url: "{{ stackhpc_repo_opensearch_dashboards_2_x_url }}" + file: "opensearch.repo" + tag: "opensearch-dashboards-2.x" # List of EPEL 9 stackhpc_epel_9_repos: diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index 725629de5..f7ecb093b 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -26,6 +26,8 @@ stackhpc_pulp_repo_epel_version: 20231020T014922 stackhpc_pulp_repo_grafana_version: 20231020T014922 stackhpc_pulp_repo_mariadb_10_6_centos8_version: 20230815T010124 stackhpc_pulp_repo_mlnx_ofed_5_7_1_0_2_0_rhel8_6_version: 20220920T151419 +stackhpc_pulp_repo_opensearch_2_x_version: 20231202T013234 +stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20231202T013234 stackhpc_pulp_repo_rabbitmq_erlang_version: 20231015T004919 stackhpc_pulp_repo_rabbitmq_server_version: 20231018T041416 stackhpc_pulp_repo_rhel_9_influxdb_version: 20231019T010143 diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 9e8af49ca..884bf679b 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -500,6 +500,18 @@ stackhpc_pulp_rpm_repos: base_path: "influxdb/rhel/9/x86_64/stable/" required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}" + - name: OpenSearch 2.x + url: "{{ stackhpc_release_pulp_content_url }}/opensearch/2.x/yum/{{ stackhpc_pulp_repo_opensearch_2_x_version }}" + distribution_name: "opensearch-2-x-" + base_path: "opensearch/2.x/yum/" + required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}" + + - name: OpenSearch Dashboards 2.x + url: "{{ stackhpc_release_pulp_content_url }}/opensearch-dashboards/2.x/yum/{{ stackhpc_pulp_repo_opensearch_dashboards_2_x_version }}" + distribution_name: "opensearch-dashboards-2-x-" + base_path: "opensearch-dashboards/2.x/yum/" + required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}" + # RPM repositories stackhpc_pulp_repository_rpm_repos: >- {%- set rpm_repos = [] -%} diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml index 0ca77eb82..3c0e32430 100644 --- a/etc/kayobe/stackhpc.yml +++ b/etc/kayobe/stackhpc.yml @@ -165,6 +165,14 @@ stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_repo_distribution }}" stackhpc_repo_rhel_9_influxdb_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/influxdb/rhel/9/x86_64/stable/{{ stackhpc_repo_rhel_9_influxdb_version }}" stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_repo_distribution }}" +# OpenSearch for RHEL 9 +stackhpc_repo_opensearch_2_x_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/opensearch/2.x/yum/{{ stackhpc_repo_opensearch_2_x_version }}" +stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_repo_distribution }}" + +# OpenSearch Dashboards for RHEL 9 +stackhpc_repo_opensearch_dashboards_2_x_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/opensearch-dashboards/2.x/yum/{{ stackhpc_repo_opensearch_dashboards_2_x_version }}" +stackhpc_repo_opensearch_dashboards_2_x_version: "{{ stackhpc_repo_distribution }}" + # Rocky 9 AppStream stackhpc_repo_rocky_9_appstream_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_9_url_version }}/AppStream/x86_64/os/{{ stackhpc_repo_rocky_9_appstream_version }}" stackhpc_repo_rocky_9_appstream_version: "{{ stackhpc_repo_distribution }}" From 0083e7228e9d406dd609317d4cc74f79bee07230 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Wed, 20 Dec 2023 09:23:29 +0100 Subject: [PATCH 2/2] add opensearch tag 2.11.1 --- etc/kayobe/kolla/globals.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 337687d65..0abaeffaf 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -23,6 +23,7 @@ kayobe_image_tags: cloudkitty_tag: yoga-20231107T165648 nova_tag: "{% raw %}{{ kayobe_image_tags['nova'][kolla_base_distro] }}{% endraw %}" neutron_tag: yoga-20231114T125927 +opensearch_tag: yoga-20231219T221916 # These overrides are currently redundant, but are kept because it's not obvious that you need them if setting haproxy_tag glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"