Fix Zed-specific changes

This commit includes two fixes.
The first swaps instances of es_heap_size with opensearch_heap_size.
The second removes kolla_base_distro from name of containers in
the local pulp repository.
Reverted changes to docs for wazuh/opensearch integration.

Author: Alex-Welsh

doc/source/configuration/wazuh.rst

@@ -73,7 +73,7 @@ Optional: define LVM volumes ``etc/kayobe/inventory/group_vars/wazuh-manager/lvm
           size: "100%VG"
           filesystem: "ext4"
           mount: true
-          mntp: “/var/lib/opensearch”
+          mntp: “/var/lib/elasticsearch”
           create: true
 
 

etc/kayobe/environments/aufn-ceph/kolla/globals.yml

@@ -13,4 +13,4 @@ cinder_backend_ceph: "yes"
 nova_backend_ceph: "yes"
 
 # Opensearch memory tuning
-es_heap_size: 1g
+opensearch_heap_size: 1g

etc/kayobe/environments/ci-aio/kolla/globals.yml

@@ -13,7 +13,7 @@ docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}"
 docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg"
 
 # Opensearch memory tuning
-es_heap_size: 1g
+opensearch_heap_size: 1g
 
 # Increase Grafana timeout
 grafana_start_first_node_retries: 20

etc/kayobe/environments/ci-multinode/kolla/globals.yml

@@ -16,7 +16,7 @@ neutron_bridge_name: "{{ vxlan_interfaces[0].device }}-ovs"
 neutron_external_interface: "{{ vxlan_interfaces[0].device }}"
 
 # Opensearch memory tuning
-es_heap_size: 1g
+opensearch_heap_size: 1g
 
 # Octavia load balancer configuration
 octavia_auto_configure: "no"

etc/kayobe/kolla/globals.yml

@@ -69,7 +69,7 @@ om_enable_rabbitmq_high_availability: true
 #############################################################################
 # Monitoring and alerting related settings
 
-es_heap_size: 8g
+opensearch_heap_size: 8g
 prometheus_cmdline_extras: "--storage.tsdb.retention.time=30d"
 
 # Additional command line flags for node exporter to enable texfile collector for disk metrics and create textfile docker volume

etc/kayobe/pulp.yml

@@ -1143,7 +1143,7 @@ stackhpc_pulp_repository_container_repos_kolla: >-
   {%- set repos = [] -%}
   {%- for image in stackhpc_pulp_images_kolla_filtered -%}
   {%- if image not in stackhpc_kolla_unbuildable_images[kolla_base_distro]-%}
-  {%- set image_repo = kolla_docker_namespace ~ "/" ~ kolla_base_distro ~ "-" ~ image -%}
+  {%- set image_repo = kolla_docker_namespace ~ "/" ~ image -%}
   {%- set repo = {"name": image_repo} -%}
   {%- set _ = repos.append(stackhpc_pulp_repository_container_repos_kolla_common | combine(repo)) -%}
   {%- endif -%}
@@ -1160,7 +1160,7 @@ stackhpc_pulp_distribution_container_kolla: >-
   {%- set distributions = [] -%}
   {%- for image in stackhpc_pulp_images_kolla_filtered -%}
   {%- if image not in stackhpc_kolla_unbuildable_images[kolla_base_distro]-%}
-  {%- set image_repo = kolla_docker_namespace ~ "/" ~ kolla_base_distro ~ "-" ~ image -%}
+  {%- set image_repo = kolla_docker_namespace ~ "/" ~ image -%}
   {%- set distribution = {"name": image_repo, "repository": image_repo, "base_path": image_repo} -%}
   {%- set _ = distributions.append(stackhpc_pulp_distribution_container_kolla_common | combine(distribution)) -%}
   {%- endif -%}