aboutsummaryrefslogtreecommitdiff
path: root/zuul.d
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2022-09-09 11:02:28 +0200
committerMichal Nasiadka <mnasiadka@gmail.com>2022-12-01 10:27:50 +0000
commite1ec02eddf9bb33fd9e34c1e4c79b7791f6fd22c (patch)
tree4edea22142bedf61c512dd8e57f0269561040934 /zuul.d
parent8f6298c84525b7164eb5ca4b476fa1c3e3426c8d (diff)
downloadkolla-ansible-e1ec02eddf9bb33fd9e34c1e4c79b7791f6fd22c.tar.gz
kolla-ansible-e1ec02eddf9bb33fd9e34c1e4c79b7791f6fd22c.zip
Replace ElasticSearch and Kibana with OpenSearch
This change replaces ElasticSearch with OpenSearch, and Kibana with OpenSearch Dashboards. It migrates the data from ElasticSearch to OpenSearch upon upgrade. No TLS support is in this patch (will be a followup). A replacement for ElasticSearch Curator will be added as a followup. Depends-On: https://review.opendev.org/c/openstack/kolla/+/830373 Co-authored-by: Doug Szumski <doug@stackhpc.com> Co-authored-by: Kyle Dean <kyle@stackhpc.com> Change-Id: Iab10ce7ea5d5f21a40b1f99b28e3290b7e9ce895
Diffstat (limited to 'zuul.d')
-rw-r--r--zuul.d/base.yaml10
-rw-r--r--zuul.d/jobs.yaml17
-rw-r--r--zuul.d/project.yaml5
3 files changed, 21 insertions, 11 deletions
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 52660692f..931ab18e7 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -203,21 +203,21 @@
scenario: ovn
- job:
- name: kolla-ansible-prometheus-efk-base
+ name: kolla-ansible-prometheus-opensearch-base
parent: kolla-ansible-base
voting: false
files:
- - ^ansible/roles/(common|elasticsearch|grafana|kibana|prometheus)/
- - ^tests/test-prometheus-efk.sh
+ - ^ansible/roles/(common|opensearch|grafana|prometheus)/
+ - ^tests/test-prometheus-opensearch.sh
vars:
- scenario: prometheus-efk
+ scenario: prometheus-opensearch
- job:
name: kolla-ansible-venus-base
parent: kolla-ansible-base
voting: false
files:
- - ^ansible/roles/(common|elasticsearch|venus)/
+ - ^ansible/roles/(common|opensearch|venus)/
- ^tests/test-venus.sh
vars:
scenario: venus
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 32a1055c7..7923aa134 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -374,20 +374,29 @@
base_distro: ubuntu
- job:
- name: kolla-ansible-rocky9-source-prometheus-efk
- parent: kolla-ansible-prometheus-efk-base
+ name: kolla-ansible-rocky9-source-prometheus-opensearch
+ parent: kolla-ansible-prometheus-opensearch-base
nodeset: kolla-ansible-rocky9
vars:
base_distro: rocky
- job:
- name: kolla-ansible-ubuntu-source-prometheus-efk
- parent: kolla-ansible-prometheus-efk-base
+ name: kolla-ansible-ubuntu-source-prometheus-opensearch
+ parent: kolla-ansible-prometheus-opensearch-base
nodeset: kolla-ansible-jammy
vars:
base_distro: ubuntu
- job:
+ name: kolla-ansible-ubuntu-source-prometheus-opensearch-upgrade
+ parent: kolla-ansible-prometheus-opensearch-base
+ nodeset: kolla-ansible-focal
+ vars:
+ base_distro: ubuntu
+ install_type: source
+ is_upgrade: yes
+
+- job:
name: kolla-ansible-rocky9-source-venus
parent: kolla-ansible-venus-base
nodeset: kolla-ansible-rocky9
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 643152fb8..7c1582986 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -49,8 +49,9 @@
- kolla-ansible-ubuntu-source-ovn
# - kolla-ansible-rocky9-source-upgrade-ovn
- kolla-ansible-ubuntu-source-upgrade-ovn
- # - kolla-ansible-rocky9-source-prometheus-efk
- - kolla-ansible-ubuntu-source-prometheus-efk
+ - kolla-ansible-rocky9-source-prometheus-opensearch
+ - kolla-ansible-ubuntu-source-prometheus-opensearch
+ - kolla-ansible-ubuntu-source-prometheus-opensearch-upgrade
# - kolla-ansible-rocky9-source-venus
- kolla-ansible-ubuntu-source-venus
- kolla-ansible-rocky9-source-cephadm