From 12ab39568e029843f800bd0e24bf507a7ea9d364 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Wed, 7 Dec 2022 23:08:04 +0100
Subject: [PATCH] Support OpenSearch configuration
Change-Id: I6af90d02e619d85b25ad364dc17d411008fd792e
---
ansible/inventory/group_vars/all/kolla | 12 ++++++------
.../roles/kolla-ansible/tests/test-extras.yml | 16 ++++++++--------
ansible/roles/kolla-openstack/defaults/main.yml | 12 ++++++------
.../molecule/enable-everything/molecule.yml | 2 +-
ansible/roles/kolla-openstack/vars/main.yml | 10 +++++-----
.../configuration/reference/kolla-ansible.rst | 2 +-
...csearch-with-opensearch-6bf0cd4250d5253e.yaml | 7 +++++++
7 files changed, 34 insertions(+), 27 deletions(-)
create mode 100644 releasenotes/notes/replace-elasticsearch-with-opensearch-6bf0cd4250d5253e.yaml
diff --git a/ansible/inventory/group_vars/all/kolla b/ansible/inventory/group_vars/all/kolla
index 8ce83f463..adc0102b8 100644
--- a/ansible/inventory/group_vars/all/kolla
+++ b/ansible/inventory/group_vars/all/kolla
@@ -152,8 +152,6 @@ overcloud_container_image_regex_map:
enabled: "{{ kolla_enable_designate | bool }}"
- regex: ^dnsmasq
enabled: "{{ kolla_enable_ironic | bool }}"
- - regex: ^elasticsearch
- enabled: "{{ kolla_enable_elasticsearch | bool }}"
- regex: ^etcd
enabled: "{{ kolla_enable_etcd | bool }}"
- regex: ^fluentd
@@ -188,8 +186,6 @@ overcloud_container_image_regex_map:
enabled: "{{ kolla_enable_keepalived | bool }}"
- regex: ^keystone
enabled: "{{ kolla_enable_keystone | bool }}"
- - regex: ^kibana
- enabled: "{{ kolla_enable_kibana | bool }}"
- regex: kolla-toolbox
enabled: True
- regex: ^logstash
@@ -226,6 +222,10 @@ overcloud_container_image_regex_map:
enabled: "{{ kolla_enable_nova | bool }}"
- regex: ^octavia
enabled: "{{ kolla_enable_octavia | bool }}"
+ - regex: opensearch
+ enabled: "{{ kolla_enable_opensearch | bool }}"
+ - regex: opensearch-dashboards
+ enabled: "{{ kolla_enable_opensearch_dashboards | bool }}"
- regex: ^openvswitch
enabled: "{{ kolla_enable_openvswitch | bool }}"
- regex: ^ovn
@@ -525,7 +525,6 @@ kolla_enable_cloudkitty: "no"
kolla_enable_collectd: "no"
kolla_enable_cyborg: "no"
kolla_enable_designate: "no"
-kolla_enable_elasticsearch: "{{ 'yes' if kolla_enable_central_logging | bool or kolla_enable_osprofiler | bool or kolla_enable_skydive | bool or kolla_enable_monasca | bool else 'no' }}"
kolla_enable_etcd: "no"
kolla_enable_fluentd: "yes"
kolla_enable_freezer: "no"
@@ -539,7 +538,6 @@ kolla_enable_ironic: "no"
kolla_enable_ironic_neutron_agent: "{{ kolla_enable_neutron | bool and kolla_enable_ironic | bool }}"
kolla_enable_iscsid: "{{ kolla_enable_cinder | bool and kolla_enable_cinder_backend_iscsi | bool }}"
kolla_enable_kafka: "{{ kolla_enable_monasca | bool }}"
-kolla_enable_kibana: "{{ 'yes' if kolla_enable_central_logging | bool or kolla_enable_monasca | bool else 'no' }}"
kolla_enable_kuryr: "no"
kolla_enable_magnum: "no"
kolla_enable_manila: "no"
@@ -556,6 +554,8 @@ kolla_enable_octavia: "no"
kolla_enable_openvswitch: "{{ kolla_enable_neutron | bool }}"
kolla_enable_ovn: "no"
kolla_enable_ovs_dpdk: "no"
+kolla_enable_opensearch: "{{ kolla_enable_central_logging | bool or kolla_enable_osprofiler | bool or kolla_enable_skydive | bool }}"
+kolla_enable_opensearch_dashboards: "{{ kolla_enable_opensearch | bool }}"
kolla_enable_osprofiler: "no"
kolla_enable_placement: "{{ kolla_enable_nova | bool or kolla_enable_zun | bool }}"
kolla_enable_prometheus: "no"
diff --git a/ansible/roles/kolla-ansible/tests/test-extras.yml b/ansible/roles/kolla-ansible/tests/test-extras.yml
index dd63639fd..c2a185a95 100644
--- a/ansible/roles/kolla-ansible/tests/test-extras.yml
+++ b/ansible/roles/kolla-ansible/tests/test-extras.yml
@@ -141,7 +141,6 @@
kolla_enable_cinder_backend_nfs: True
kolla_enable_cloudkitty: True
kolla_enable_designate: True
- kolla_enable_elasticsearch: True
kolla_enable_etcd: True
kolla_enable_freezer: True
kolla_enable_gnocchi: True
@@ -153,7 +152,6 @@
kolla_enable_ironic: True
kolla_enable_ironic_neutron_agent: True
kolla_enable_kafka: True
- kolla_enable_kibana: True
kolla_enable_kuryr: True
kolla_enable_magnum: True
kolla_enable_manila: True
@@ -162,8 +160,8 @@
kolla_enable_mariadb: True
kolla_enable_mistral: True
kolla_enable_monasca: True
- kolla_enable_murano: True
kolla_enable_multipathd: True
+ kolla_enable_murano: True
kolla_enable_neutron_agent_ha: True
kolla_enable_neutron_bgp_dragent: True
kolla_enable_neutron_dvr: True
@@ -172,6 +170,8 @@
kolla_enable_neutron_vpnaas: True
kolla_enable_nova_serialconsole_proxy: True
kolla_enable_octavia: True
+ kolla_enable_opensearch: True
+ kolla_enable_opensearch_dashboards: True
kolla_enable_osprofiler: True
kolla_enable_prometheus: True
kolla_enable_sahara: True
@@ -259,14 +259,13 @@
#enable_ceilometer: True
#enable_central_logging: True
#enable_cinder: True
- #enable_cinder_backend_iscsi: True
#enable_cinder_backend_hnas_iscsi: True
#enable_cinder_backend_hnas_nfs: True
+ #enable_cinder_backend_iscsi: True
#enable_cinder_backend_lvm: True
#enable_cinder_backend_nfs: True
#enable_cloudkitty: True
#enable_designate: True
- #enable_elasticsearch: True
#enable_etcd: True
#enable_freezer: True
#enable_gnocchi: True
@@ -278,7 +277,6 @@
#enable_ironic: True
#enable_ironic_neutron_agent: True
#enable_kafka: True
- #enable_kibana: True
#enable_kuryr: True
#enable_magnum: True
#enable_manila: True
@@ -287,8 +285,8 @@
#enable_mariadb: True
#enable_mistral: True
#enable_monasca: True
- #enable_murano: True
#enable_multipathd: True
+ #enable_murano: True
#enable_neutron_agent_ha: True
#enable_neutron_bgp_dragent: True
#enable_neutron_dvr: True
@@ -297,12 +295,14 @@
#enable_neutron_vpnaas: True
#enable_nova_serialconsole_proxy: True
#enable_octavia: True
+ #enable_opensearch: True
+ #enable_opensearch_dashboards: True
#enable_osprofiler: True
#enable_prometheus: True
#enable_sahara: True
+ #enable_senlin: True
#enable_skydive: True
#enable_solum: True
- #enable_senlin: True
#enable_storm: True
#enable_swift: True
#enable_tacker: True
diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml
index 8e11cb365..51d1a9ce3 100644
--- a/ansible/roles/kolla-openstack/defaults/main.yml
+++ b/ansible/roles/kolla-openstack/defaults/main.yml
@@ -74,12 +74,6 @@ kolla_enable_designate:
# Free form extra configuration to append to designate.conf.
kolla_extra_designate:
-###############################################################################
-# Elasticsearch configuration.
-
-# Whether to enable elasticsearch.
-kolla_enable_elasticsearch:
-
###############################################################################
# Glance configuration.
@@ -459,6 +453,12 @@ kolla_nova_libvirt_certificates_src:
# Whether to enable Octavia.
kolla_enable_octavia:
+###############################################################################
+# OpenSearch configuration.
+
+# Whether to enable opensearch.
+kolla_enable_opensearch:
+
###############################################################################
# Placement configuration.
diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
index d090b7e6d..2c00d99f5 100644
--- a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
+++ b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
@@ -44,7 +44,6 @@ provisioner:
kolla_extra_designate: |
[extra-designate.conf]
foo=bar
- kolla_enable_elasticsearch: true
kolla_enable_glance: true
kolla_extra_glance: |
[extra-glance.conf]
@@ -126,6 +125,7 @@ provisioner:
kolla_extra_octavia: |
[extra-octavia.conf]
foo=bar
+ kolla_enable_opensearch: true
kolla_enable_placement: true
kolla_extra_placement: |
[extra-placement.conf]
diff --git a/ansible/roles/kolla-openstack/vars/main.yml b/ansible/roles/kolla-openstack/vars/main.yml
index 8033b354f..8036bf7a9 100644
--- a/ansible/roles/kolla-openstack/vars/main.yml
+++ b/ansible/roles/kolla-openstack/vars/main.yml
@@ -44,11 +44,6 @@ kolla_openstack_custom_config:
dest: "{{ kolla_node_custom_config_path }}/designate"
patterns: "*"
enabled: "{{ kolla_enable_designate }}"
- # Elasticsearch.
- - src: "{{ kolla_extra_config_path }}/elasticsearch"
- dest: "{{ kolla_node_custom_config_path }}/elasticsearch"
- patterns: "*"
- enabled: "{{ kolla_enable_elasticsearch }}"
# Fluentd filters.
- src: "{{ kolla_extra_config_path }}//fluentd/filter"
dest: "{{ kolla_node_custom_config_path }}/fluentd/filter"
@@ -204,6 +199,11 @@ kolla_openstack_custom_config:
dest: "{{ kolla_node_custom_config_path }}/octavia"
patterns: "*"
enabled: "{{ kolla_enable_octavia }}"
+ # OpenSearch.
+ - src: "{{ kolla_extra_config_path }}/opensearch"
+ dest: "{{ kolla_node_custom_config_path }}/opensearch"
+ patterns: "*"
+ enabled: "{{ kolla_enable_opensearch }}"
# Placement
- src: "{{ kolla_extra_config_path }}/placement"
dest: "{{ kolla_node_custom_config_path }}/placement"
diff --git a/doc/source/configuration/reference/kolla-ansible.rst b/doc/source/configuration/reference/kolla-ansible.rst
index dc926c48f..61b429e24 100644
--- a/doc/source/configuration/reference/kolla-ansible.rst
+++ b/doc/source/configuration/reference/kolla-ansible.rst
@@ -676,7 +676,6 @@ which files are supported.
``cloudkitty/*`` Extended CloudKitty configuration.
``designate.conf`` Designate configuration.
``designate/*`` Extended Designate configuration.
- ``elasticsearch/*`` Elasticsearch configuration.
``fluentd/filter`` Fluentd filter configuration.
``fluentd/input`` Fluentd input configuration.
``fluentd/output`` Fluentd output configuration.
@@ -719,6 +718,7 @@ which files are supported.
``nova/*`` Extended nova configuration.
``octavia.conf`` Octavia configuration.
``octavia/*`` Extended Octavia configuration.
+ ``opensearch/*`` OpenSearch configuration.
``placement.conf`` Placement configuration.
``placement/*`` Extended Placement configuration.
``prometheus/*`` Prometheus configuration.
diff --git a/releasenotes/notes/replace-elasticsearch-with-opensearch-6bf0cd4250d5253e.yaml b/releasenotes/notes/replace-elasticsearch-with-opensearch-6bf0cd4250d5253e.yaml
new file mode 100644
index 000000000..404a29148
--- /dev/null
+++ b/releasenotes/notes/replace-elasticsearch-with-opensearch-6bf0cd4250d5253e.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+ - |
+ Elasticsearch has been replaced with OpenSearch. Any custom Kayobe
+ configuration should be moved from
+ ``${KAYOBE_CONFIG_PATH}/kolla/config/elasticsearch`` to
+ ``${KAYOBE_CONFIG_PATH}/kolla/config/opensearch``.