Merge branch 'stackhpc:stackhpc/yoga' into stackhpc/yoga

Author: scrungus

doc/source/configuration/monitoring.rst

@@ -127,3 +127,12 @@ If you want to add an alerting rule, there are many good examples of alerts are
 available `here <https://awesome-prometheus-alerts.grep.to/>`__. They simply
 need to be added to one of the ``*.rules`` files in the prometheus configuration
 directory.
+
+Ceph Monitoring
+===============
+
+There is code in the globals.yml file to extract the ceph mgr nodes from the
+mgrs group and list them as the endpoints for prometheus. Additionally,
+depending on your configuration, you may need set the
+``kolla_enable_prometheus_ceph_mgr_exporter`` variable to ``true`` in order to
+enable the ceph mgr exporter.

etc/kayobe/ansible/cephadm-gather-keys.yml

@@ -43,8 +43,7 @@
         path: "{{ kayobe_env_config_path }}/kolla/config/{{ kolla_service_to_key_dir[item.name] }}"
       loop: "{{ kolla_ceph_services | selectattr('required') }}"
       loop_control:
-        label:
-          service: "{{ item.name }}"
+        label: "{{ item.name }}"
       delegate_to: localhost
 
     - name: Save Ceph keys to Kayobe configuration
@@ -59,9 +58,7 @@
         dest: "{{ kayobe_env_config_path }}/kolla/config/{{ kolla_service_to_key_dir[item.0.name] }}/ceph.{{ cephadm_user }}.keyring"
       loop: "{{ query('subelements', kolla_ceph_services | selectattr('required'), 'keys') }}"
       loop_control:
-        label:
-          service: "{{ item.0.name }}"
-          key: "{{ item.1 }}"
+        label: "{{ item.0.name }}: {{ item.1 }}"
       delegate_to: localhost
       notify: Please add and commit the Kayobe configuration
 
@@ -74,9 +71,7 @@
         dest: "{{ kayobe_env_config_path }}/kolla/config/{{ kolla_service_to_conf_dir[item.0.name] }}/ceph.conf"
       loop: "{{ query('subelements', kolla_ceph_services | selectattr('required'), 'keys') }}"
       loop_control:
-        label:
-          service: "{{ item.0.name }}"
-          key: "{{ item.1 }}"
+        label: "{{ item.0.name }}: {{ item.1 }}"
       delegate_to: localhost
       notify: Please add and commit the Kayobe configuration
 

etc/kayobe/ansible/smartmon-tools.yml

@@ -2,12 +2,13 @@
 - hosts: overcloud
 
   tasks:
-    - name: Ensure smartmon-tools and nvme-cli is installed
+    - name: Ensure smartmon-tools, jq, nvme-cli and cron/cronie is installed
       package:
         name:
           - smartmontools
           - nvme-cli
           - jq
+          - "{{ 'cron' if ansible_facts['distribution'] == 'Ubuntu' else 'cronie' }}"
         state: present
       become: true
 

etc/kayobe/environments/ci-aio/stackhpc-ci.yml

@@ -5,9 +5,6 @@
 # Docker namespace to use for Kolla images. Default is 'kolla'.
 kolla_docker_namespace: stackhpc-dev
 
-# Do not enable central logging if using Rocky Linux 9. It does not have elasticsearch
-kolla_enable_central_logging: "{{ os_release != '9' }}"
-
 ###############################################################################
 # Network configuration.
 
@@ -54,8 +51,6 @@ stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stre
 stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_4_version }}"
 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_rocky_9_crb_version: "{{ stackhpc_pulp_repo_rocky_9_1_crb_version }}"
-stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_pulp_repo_rocky_9_1_highavailability_version }}"
 stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_epel_9_version }}"
 ## Use derived vars from etc/kayobe/pulp.yml to switch between
 ## minor Rocky versions using stackhpc_pulp_repo_rocky_x_minor_version
@@ -65,6 +60,9 @@ stackhpc_repo_rocky_extras_version: "{{ stackhpc_pulp_repo_rocky_8_extras_versio
 stackhpc_repo_rocky_9_baseos_version: "{{ stackhpc_pulp_repo_rocky_9_baseos_version }}"
 stackhpc_repo_rocky_9_appstream_version: "{{ stackhpc_pulp_repo_rocky_9_appstream_version }}"
 stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_pulp_repo_rocky_9_extras_version }}"
+stackhpc_repo_rocky_9_crb_version: "{{ stackhpc_pulp_repo_rocky_9_crb_version }}"
+stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_pulp_repo_rocky_9_highavailability_version }}"
+stackhpc_pulp_repo_rocky_9_minor_version: 1
 
 # Rocky-and-CI-specific Pulp urls
 stackhpc_include_os_minor_version_in_repo_url: true

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

@@ -75,8 +75,6 @@ stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stre
 stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_4_version }}"
 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_rocky_9_crb_version: "{{ stackhpc_pulp_repo_rocky_9_1_crb_version }}"
-stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_pulp_repo_rocky_9_1_highavailability_version }}"
 stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_epel_9_version }}"
 ## Use derived vars from etc/kayobe/pulp.yml to switch between
 ## minor Rocky versions using stackhpc_pulp_repo_rocky_x_minor_version
@@ -86,6 +84,8 @@ stackhpc_repo_rocky_extras_version: "{{ stackhpc_pulp_repo_rocky_8_extras_versio
 stackhpc_repo_rocky_9_baseos_version: "{{ stackhpc_pulp_repo_rocky_9_baseos_version }}"
 stackhpc_repo_rocky_9_appstream_version: "{{ stackhpc_pulp_repo_rocky_9_appstream_version }}"
 stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_pulp_repo_rocky_9_extras_version }}"
+stackhpc_repo_rocky_9_crb_version: "{{ stackhpc_pulp_repo_rocky_9_crb_version }}"
+stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_pulp_repo_rocky_9_highavailability_version }}"
 
 # Rocky-and-CI-specific Pulp urls
 stackhpc_include_os_minor_version_in_repo_url: true

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

@@ -51,8 +51,10 @@ os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
 
 # OS release. Valid options are "8-stream" when os_distribution is "centos", or
 # "focal" when os_distribution is "ubuntu".
-#os_release:
-
+os_release: >-
+          {{ (lookup('pipe', '. /etc/os-release && echo $VERSION_CODENAME') | trim) if os_distribution == 'ubuntu' else
+             (lookup('pipe', '. /etc/os-release && echo $VERSION_ID') | trim | split('.') | first) if os_distribution == 'rocky' else
+             'stream-8' }}
 ###############################################################################
 
 # Avoid a reboot.

etc/kayobe/environments/ci-multinode/networks.yml

@@ -81,7 +81,7 @@ internal_vlan: 101
 
 # External network
 external_cidr: 192.168.38.0/24
-external_mtu: 1450
+external_mtu: "{{ ansible_facts.default_ipv4.mtu - 50 }}"
 external_allocation_pool_start: 192.168.38.3
 external_allocation_pool_end: 192.168.38.128
 external_vlan: 102

etc/kayobe/environments/ci-multinode/stackhpc-ci.yml

@@ -51,8 +51,6 @@ stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stre
 stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_4_version }}"
 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_rocky_9_crb_version: "{{ stackhpc_pulp_repo_rocky_9_1_crb_version }}"
-stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_pulp_repo_rocky_9_1_highavailability_version }}"
 stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_epel_9_version }}"
 ## Use derived vars from etc/kayobe/pulp.yml to switch between
 ## minor Rocky versions using stackhpc_pulp_repo_rocky_x_minor_version
@@ -62,6 +60,8 @@ stackhpc_repo_rocky_extras_version: "{{ stackhpc_pulp_repo_rocky_8_extras_versio
 stackhpc_repo_rocky_9_baseos_version: "{{ stackhpc_pulp_repo_rocky_9_baseos_version }}"
 stackhpc_repo_rocky_9_appstream_version: "{{ stackhpc_pulp_repo_rocky_9_appstream_version }}"
 stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_pulp_repo_rocky_9_extras_version }}"
+stackhpc_repo_rocky_9_crb_version: "{{ stackhpc_pulp_repo_rocky_9_crb_version }}"
+stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_pulp_repo_rocky_9_highavailability_version }}"
 
 # Rocky-and-CI-specific Pulp urls
 stackhpc_include_os_minor_version_in_repo_url: true