Merge pull request #601 from stackhpc/zed-reno-changes

markgoddard · web-flow · commit 55eb712c1678 · 2023-08-29T14:22:41.000+01:00
Zed reno changes
diff --git a/doc/source/configuration/monitoring.rst b/doc/source/configuration/monitoring.rst
@@ -6,8 +6,8 @@ Monitoring Configuration
 ========================
 
 StackHPC kayobe config includes a reference monitoring and alerting stack based
-on Prometheus, Alertmanager, Grafana, Fluentd, Elasticsearch & Kibana. These
-services by default come enabled and configured.
+on Prometheus, Alertmanager, Grafana, Fluentd, OpenSearch & OpenSearch
+Dashboards. These services by default come enabled and configured.
 
 Monitoring hosts, usually the controllers, should be added to the monitoring
 group. The group definition can be applied in various different places. For
@@ -18,7 +18,7 @@ example, this configuration could be added to etc/kayobe/inventory/groups:
     [monitoring:children]
     controllers
 
-Central Elasticsearch cluster collects OpenStack logs, with an option to receive
+Central OpenSearch cluster collects OpenStack logs, with an option to receive
 operating system logs too. In order to enable this, execute custom playbook
 after deployment:
 
diff --git a/etc/kayobe/ansible/rsyslog.yml b/etc/kayobe/ansible/rsyslog.yml
@@ -1,6 +1,6 @@
 ---
 # Custom playbook to configure rsyslog to forward operating system logs to
-# fluentd, eventually reaching Kolla's Elasticsearch cluster.
+# fluentd, eventually reaching Kolla's Opensearch cluster.
 #
 # Variables:
 # * rsyslog_group: Host pattern against which to target the playbook. Default
diff --git a/etc/kayobe/compute.yml b/etc/kayobe/compute.yml
@@ -196,6 +196,13 @@
 # compute_libvirt_ceph_repo_install is true. Default is 'pacific'.
 #compute_libvirt_ceph_repo_release:
 
+###############################################################################
+# Compute node swap configuration.
+
+# List of swap devices. Each item is a dict containing a 'device' item. Default
+# is an empty list.
+# compute_swap:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes
diff --git a/etc/kayobe/controllers.yml b/etc/kayobe/controllers.yml
@@ -152,6 +152,13 @@
 # - state: enabled
 #controller_firewalld_rules:
 
+###############################################################################
+# Controller node swap configuration.
+
+# List of swap devices. Each item is a dict containing a 'device' item. Default
+# is an empty list.
+# controller_swap:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes
diff --git a/etc/kayobe/environments/aufn-ceph/kolla/globals.yml b/etc/kayobe/environments/aufn-ceph/kolla/globals.yml
@@ -12,5 +12,5 @@ glance_backend_ceph: "yes"
 cinder_backend_ceph: "yes"
 nova_backend_ceph: "yes"
 
-# Elasticsearch memory tuning
-es_heap_size: 1g
+# Opensearch memory tuning
+opensearch_heap_size: 1g
diff --git a/etc/kayobe/environments/aufn-ceph/kolla/inventory/overcloud-services.j2 b/etc/kayobe/environments/aufn-ceph/kolla/inventory/overcloud-services.j2
@@ -24,10 +24,6 @@ common
 [kolla-toolbox:children]
 common
 
-# Elasticsearch Curator
-[elasticsearch-curator:children]
-elasticsearch
-
 # Glance
 [glance-api:children]
 glance
@@ -199,41 +195,6 @@ murano
 [murano-engine:children]
 murano
 
-# Monasca
-[monasca-agent-collector:children]
-monasca-agent
-
-[monasca-agent-forwarder:children]
-monasca-agent
-
-[monasca-agent-statsd:children]
-monasca-agent
-
-[monasca-api:children]
-monasca
-
-[monasca-log-persister:children]
-monasca
-
-[monasca-log-metrics:children]
-monasca
-
-[monasca-thresh:children]
-monasca
-
-[monasca-notification:children]
-monasca
-
-[monasca-persister:children]
-monasca
-
-# Storm
-[storm-worker:children]
-storm
-
-[storm-nimbus:children]
-storm
-
 # Ironic
 [ironic-api:children]
 ironic
@@ -514,6 +475,7 @@ monitoring
 [prometheus-openstack-exporter:children]
 monitoring
 
+# NOTE(Alex-Welsh): This might need removing, since we have moved to opensearch
 [prometheus-elasticsearch-exporter:children]
 elasticsearch
 
diff --git a/etc/kayobe/environments/ci-aio/globals.yml b/etc/kayobe/environments/ci-aio/globals.yml
@@ -56,7 +56,7 @@ os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
 ###############################################################################
 
 # Avoid a reboot.
-disable_selinux_do_reboot: false
+selinux_do_reboot: false
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
diff --git a/etc/kayobe/environments/ci-aio/kolla/globals.yml b/etc/kayobe/environments/ci-aio/kolla/globals.yml
@@ -12,8 +12,8 @@ openstack_service_rpc_workers: "1"
 docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}"
 docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg"
 
-# Elasticsearch memory tuning
-es_heap_size: 1g
+# Opensearch memory tuning
+opensearch_heap_size: 1g
 
 # Increase Grafana timeout
 grafana_start_first_node_retries: 20
diff --git a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml
@@ -33,7 +33,6 @@ stackhpc_repo_centos_stream_openstack_yoga_version: "{{ stackhpc_pulp_repo_cento
 stackhpc_repo_centos_stream_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_8_opstools_version }}"
 stackhpc_repo_centos_stream_powertools_version: "{{ stackhpc_pulp_repo_centos_stream_8_powertools_version }}"
 stackhpc_repo_centos_stream_storage_ceph_pacific_version: "{{ stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}"
-stackhpc_repo_elasticsearch_logstash_kibana_7_x_version: "{{ stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version }}"
 stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
 stackhpc_repo_mariadb_10_6_centos8_version: "{{ stackhpc_pulp_repo_mariadb_10_6_centos8_version }}"
 stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rabbitmq_erlang_version }}"
diff --git a/etc/kayobe/environments/ci-builder/globals.yml b/etc/kayobe/environments/ci-builder/globals.yml
@@ -12,4 +12,4 @@ os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
 # SELinux.
 
 # Avoid a reboot.
-disable_selinux_do_reboot: false
+selinux_do_reboot: false
diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
@@ -13,7 +13,6 @@ kolla_enable_central_logging: true
 kolla_enable_cinder: true
 kolla_enable_cloudkitty: true
 kolla_enable_designate: true
-kolla_enable_elasticsearch_curator: true
 kolla_enable_etcd: true
 kolla_enable_grafana: true
 kolla_enable_influxdb: true
@@ -57,7 +56,6 @@ stackhpc_repo_centos_stream_openstack_yoga_version: "{{ stackhpc_pulp_repo_cento
 stackhpc_repo_centos_stream_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_8_opstools_version }}"
 stackhpc_repo_centos_stream_powertools_version: "{{ stackhpc_pulp_repo_centos_stream_8_powertools_version }}"
 stackhpc_repo_centos_stream_storage_ceph_pacific_version: "{{ stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}"
-stackhpc_repo_elasticsearch_logstash_kibana_7_x_version: "{{ stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version }}"
 stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
 stackhpc_repo_mariadb_10_6_centos8_version: "{{ stackhpc_pulp_repo_mariadb_10_6_centos8_version }}"
 stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rabbitmq_erlang_version }}"
diff --git a/etc/kayobe/environments/ci-multinode/globals.yml b/etc/kayobe/environments/ci-multinode/globals.yml
@@ -64,7 +64,7 @@ stackhpc_barbican_role_id_file_path: "/tmp/barbican-role-id"
 ###############################################################################
 
 # Avoid a reboot.
-disable_selinux_do_reboot: false
+selinux_do_reboot: false
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
diff --git a/etc/kayobe/environments/ci-multinode/kolla/globals.yml b/etc/kayobe/environments/ci-multinode/kolla/globals.yml
@@ -15,8 +15,8 @@ nova_backend_ceph: "yes"
 neutron_bridge_name: "{{ vxlan_interfaces[0].device }}-ovs"
 neutron_external_interface: "{{ vxlan_interfaces[0].device }}"
 
-# Elasticsearch memory tuning
-es_heap_size: 1g
+# Opensearch memory tuning
+opensearch_heap_size: 1g
 
 # Octavia load balancer configuration
 octavia_auto_configure: "no"
diff --git a/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml b/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml
@@ -33,7 +33,6 @@ stackhpc_repo_centos_stream_openstack_yoga_version: "{{ stackhpc_pulp_repo_cento
 stackhpc_repo_centos_stream_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_8_opstools_version }}"
 stackhpc_repo_centos_stream_powertools_version: "{{ stackhpc_pulp_repo_centos_stream_8_powertools_version }}"
 stackhpc_repo_centos_stream_storage_ceph_pacific_version: "{{ stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}"
-stackhpc_repo_elasticsearch_logstash_kibana_7_x_version: "{{ stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version }}"
 stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
 stackhpc_repo_mariadb_10_6_centos8_version: "{{ stackhpc_pulp_repo_mariadb_10_6_centos8_version }}"
 stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rabbitmq_erlang_version }}"
diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml
@@ -172,6 +172,13 @@
 # - state: enabled
 #infra_vm_firewalld_rules:
 
+###############################################################################
+# Infrastructure VM node swap configuration.
+
+# List of swap devices. Each item is a dict containing a 'device' item. Default
+# is an empty list.
+# infra_vm_swap:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
@@ -26,10 +26,6 @@ kolla_source_version: "{{ stackhpc_kolla_source_version }}"
 ###############################################################################
 # Kolla-ansible installation.
 
-# Type of Kolla-ansible control installation. One of 'binary' or 'source'.
-# Default is 'source'.
-#kolla_ansible_ctl_install_type:
-
 # Path to directory for kolla-ansible source code checkout.
 # Default is $KOLLA_SOURCE_PATH, or $PWD/src/kolla-ansible if
 # $KOLLA_SOURCE_PATH is not set.
diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
@@ -64,15 +64,12 @@ ironic_dnsmasq_tag: "{% raw %}{{ kayobe_image_tags['ironic_dnsmasq'][kolla_base_
 opensearch_tag: "{% raw %}{{ kayobe_image_tags['opensearch'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
 prometheus_node_exporter_tag: "{% raw %}{{ kayobe_image_tags['prometheus_node_exporter'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
 
-glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"
-neutron_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"
-
 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
diff --git a/etc/kayobe/monitoring.yml b/etc/kayobe/monitoring.yml
@@ -116,6 +116,13 @@
 # - state: enabled
 #monitoring_firewalld_rules:
 
+###############################################################################
+# Monitoring node swap configuration.
+
+# List of swap devices. Each item is a dict containing a 'device' item. Default
+# is an empty list.
+# monitoring_swap:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes
diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
@@ -17,7 +17,6 @@ stackhpc_pulp_repo_centos_stream_9_opstools_version: 20230301T034123
 stackhpc_pulp_repo_centos_stream_9_storage_ceph_pacific_version: 20230308T155704
 stackhpc_pulp_repo_docker_ce_ubuntu_version: 20230420T073634
 stackhpc_pulp_repo_docker_version: 20230203T025251
-stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20230203T025251
 stackhpc_pulp_repo_epel_9_version: 20230302T031902
 stackhpc_pulp_repo_epel_modular_version: 20220913T043117
 stackhpc_pulp_repo_epel_version: 20230206T150339
diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml
@@ -428,18 +428,6 @@ stackhpc_pulp_repository_rpm_repos:
     state: present
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
 
-  - name: ELK repository for 7.x packages
-    url: "{{ stackhpc_release_pulp_content_url }}/elasticsearch/oss-7.x/{{ stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version }}"
-    remote_username: "{{ stackhpc_release_pulp_username }}"
-    remote_password: "{{ stackhpc_release_pulp_password }}"
-    client_cert: ""
-    client_key: ""
-    policy: on_demand
-    proxy_url: "{{ pulp_proxy_url }}"
-    sync_policy: mirror_complete
-    state: present
-    required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
-
   - name: Grafana
     url: "{{ stackhpc_release_pulp_content_url }}/grafana/oss/rpm/{{ stackhpc_pulp_repo_grafana_version }}"
     remote_username: "{{ stackhpc_release_pulp_username }}"
@@ -725,11 +713,6 @@ stackhpc_pulp_distribution_rpm_development:
     repository: CentOS Stream 8 - Ceph Pacific
     state: present
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
-  - name: "elasticsearch-logstash-kibana-7.x-development"
-    base_path: "elasticsearch/oss-7.x/development"
-    repository: ELK repository for 7.x packages
-    state: present
-    required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
   - name: "grafana-development"
     base_path: "grafana/oss/rpm/development"
     repository: Grafana
@@ -924,11 +907,6 @@ stackhpc_pulp_distribution_rpm_production:
     repository: CentOS Stream 8 - Ceph Pacific
     state: present
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
-  - name: "elasticsearch-logstash-kibana-7.x-production"
-    base_path: "elasticsearch/oss-7.x/production"
-    repository: ELK repository for 7.x packages
-    state: present
-    required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
   - name: "grafana-production"
     base_path: "grafana/oss/rpm/production"
     repository: Grafana
@@ -1055,8 +1033,6 @@ stackhpc_pulp_images_kolla:
   - designate-sink
   - designate-worker
   - dnsmasq
-  - elasticsearch
-  - elasticsearch-curator
   - etcd
   - fluentd
   - glance-api
@@ -1071,7 +1047,7 @@ stackhpc_pulp_images_kolla:
   - ironic-conductor
   - ironic-inspector
   - ironic-neutron-agent
-  - ironic-pxe
+  - ironic-tftp
   - iscsid
   - keepalived
   - keystone
@@ -1121,7 +1097,6 @@ stackhpc_pulp_images_kolla:
   - prometheus-alertmanager
   - prometheus-blackbox-exporter
   - prometheus-cadvisor
-  - prometheus-elasticsearch-exporter
   - prometheus-haproxy-exporter
   - prometheus-jiralert
   - prometheus-libvirt-exporter
@@ -1141,12 +1116,8 @@ stackhpc_pulp_images_kolla:
 # List of images for each base distribution which should not/cannot be built.
 stackhpc_kolla_unbuildable_images:
   ubuntu: []
-  centos: []
   rocky:
-    - elasticsearch
-    - elasticsearch-curator
     - iscsid
-    - kibana
 
 # Whitespace-separated list of regular expressions matching Kolla image names.
 # Usage is similar to kolla-build CLI arguments.
@@ -1172,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 ~ "-" ~ kolla_install_type ~ "-" ~ 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 -%}
@@ -1189,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 ~ "-" ~ kolla_install_type ~ "-" ~ 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 -%}
diff --git a/etc/kayobe/seed-hypervisor.yml b/etc/kayobe/seed-hypervisor.yml
@@ -135,6 +135,13 @@
 # - state: enabled
 #seed_hypervisor_firewalld_rules:
 
+###############################################################################
+# Seed Hypervisor node swap configuration.
+
+# List of swap devices. Each item is a dict containing a 'device' item. Default
+# is an empty list.
+# seed_hypervisor_swap:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes
diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml
@@ -173,6 +173,13 @@ seed_extra_containers: {}
 # - state: enabled
 #seed_firewalld_rules:
 
+###############################################################################
+# Seed node swap configuration.
+
+# List of swap devices. Each item is a dict containing a 'device' item. Default
+# is an empty list.
+# seed_swap:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes
diff --git a/etc/kayobe/storage.yml b/etc/kayobe/storage.yml
diff --git a/requirements.txt b/requirements.txt

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`---`
`2`	`2`	`# Custom playbook to configure rsyslog to forward operating system logs to`
`3`		`-# fluentd, eventually reaching Kolla's Elasticsearch cluster.`
	`3`	`+# fluentd, eventually reaching Kolla's Opensearch cluster.`
`4`	`4`	`#`
`5`	`5`	`# Variables:`
`6`	`6`	`# * rsyslog_group: Host pattern against which to target the playbook. Default`