Yoga: sync with Xena

.github/workflows/stackhpc-all-in-one.yml

@@ -232,3 +232,8 @@ jobs:
           OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
           OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
         if: always()
+
+      - name: Prune Docker images over 1 week old
+        # May fail if another prune is running
+        run: sudo docker image prune --force --filter until=168h || true
+        if: always()

.github/workflows/stackhpc-pull-request.yml

@@ -14,6 +14,8 @@ jobs:
             python-version: 3.8
           - environment: releasenotes
             python-version: 3.8
+          - environment: docs
+            python-version: 3.8
     name: Tox ${{ matrix.environment }} with Python ${{ matrix.python-version }}
     if: github.repository == 'stackhpc/stackhpc-kayobe-config'
     steps:

doc/requirements.txt

@@ -0,0 +1,7 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+
+reno>=3.1.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD

doc/source/conf.py

@@ -0,0 +1,93 @@
+# Copyright (c) 2017 StackHPC Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+# -*- coding: utf-8 -*-
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# -- General configuration ----------------------------------------------------
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = [
+    #'sphinx.ext.autodoc',
+    #'sphinx.ext.intersphinx',
+    'sphinxcontrib.rsvgconverter',
+]
+
+# autodoc generation is a bit aggressive and a nuisance when doing heavy
+# text edit cycles.
+# execute "export SPHINX_DEBUG=1" in your terminal to disable
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = 'stackhpc-kayobe-config'
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+add_module_names = True
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'native'
+
+# -- Options for HTML output --------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  Major themes that come with
+# Sphinx are currently 'default' and 'sphinxdoc'.
+# html_theme_path = []
+html_theme = 'default'
+# html_static_path = ['static']
+
+# Add any paths that contain "extra" files, such as .htaccess or
+# robots.txt.
+# html_extra_path = ['_extra']
+
+html_theme_options = {
+    # "show_other_versions": True,
+}
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = '%sdoc' % project
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass
+# [howto/manual]).
+# latex_documents = [
+#     ('index',
+#      'doc-%s.tex' % project,
+#      '%s Documentation' % project,
+#      'OpenStack Foundation', 'manual'),
+# ]
+
+# Disable usage of xindy https://bugzilla.redhat.com/show_bug.cgi?id=1643664
+latex_use_xindy = False
+

doc/source/index.rst

@@ -0,0 +1,27 @@
+.. kayobe documentation master file, created by
+   sphinx-quickstart on Tue Jul  9 22:26:36 2013.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+==================================================
+Welcome to StackHPC's Kayobe Config documentation!
+==================================================
+
+
+Overview
+========
+
+
+
+Contents
+========
+
+
+
+Intro
+=====
+
+
+
+Contributors Guide
+==================

etc/kayobe/ansible/growroot.yml

@@ -76,4 +76,7 @@
         pv: "{{ pvs.stdout | from_json }}"
         disk: "{{ pv.report[0].pv[0].pv_name }}"
       become: True
-      when: "'NOCHANGE' not in growpart.stdout"
+#      when: "'NOCHANGE' not in growpart.stdout"
+# Commenting out the conditional because growpart is already triggered by cloud-init - hence it emits NOCHANGE
+# Cloud-Inits growpart implementation has a bug https://bugzilla.redhat.com/show_bug.cgi?id=2122575
+# PVresize is not being triggered

etc/kayobe/dnf.yml

@@ -41,7 +41,27 @@
 #     file: myrepo
 #     gpgkey: http://gpgkey
 #     gpgcheck: yes
-dnf_custom_repos:
+dnf_custom_repos: "{{ dnf_custom_repos_el8 | combine(lookup('vars', 'dnf_custom_repos_' ~ ansible_facts.distribution | lower )) }}"
+
+# Custom repositories shared between all RHEL derivatives.
+dnf_custom_repos_el8:
+  epel:
+    baseurl: "{{ stackhpc_repo_epel_url }}"
+    description: "Extra Packages for Enterprise Linux $releasever - $basearch"
+    enabled: "{{ dnf_enable_epel | bool }}"
+    file: epel
+    gpgkey: "{{ dnf_epel_gpg_key_url }}"
+    gpgcheck: yes
+  epel-modular:
+    baseurl: "{{ stackhpc_repo_epel_modular_url }}"
+    description: "Extra Packages for Enterprise Linux Modular $releasever - $basearch"
+    enabled: "{{ dnf_enable_epel | bool }}"
+    file: epel-modular
+    gpgkey: "{{ dnf_epel_gpg_key_url }}"
+    gpgcheck: yes
+
+# CentOS Stream 8 specific repositories
+dnf_custom_repos_centos:
   appstream:
     baseurl: "{{ stackhpc_repo_centos_stream_appstream_url }}"
     description: "CentOS Stream $releasever - AppStream"
@@ -60,19 +80,26 @@ dnf_custom_repos:
     file: CentOS-Stream-Extras
     gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
     gpgcheck: yes
-  epel:
-    baseurl: "{{ stackhpc_repo_epel_url }}"
-    description: "Extra Packages for Enterprise Linux $releasever - $basearch"
-    enabled: "{{ dnf_enable_epel | bool }}"
-    file: epel
-    gpgkey: "{{ dnf_epel_gpg_key_url }}"
+
+# Rocky 8 specific repositories
+dnf_custom_repos_rocky:
+  appstream:
+    baseurl: "{{ stackhpc_repo_rocky_appstream_url }}"
+    description: "Rocky Linux $releasever - AppStream"
+    file: Rocky-AppStream
+    gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
     gpgcheck: yes
-  epel-modular:
-    baseurl: "{{ stackhpc_repo_epel_modular_url }}"
-    description: "Extra Packages for Enterprise Linux Modular $releasever - $basearch"
-    enabled: "{{ dnf_enable_epel | bool }}"
-    file: epel-modular
-    gpgkey: "{{ dnf_epel_gpg_key_url }}"
+  baseos:
+    baseurl: "{{ stackhpc_repo_rocky_baseos_url }}"
+    description: "Rocky Linux $releasever - BaseOS"
+    file: Rocky-BaseOS
+    gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+    gpgcheck: yes
+  extras:
+    baseurl: "{{ stackhpc_repo_rocky_extras_url }}"
+    description: "Rocky Linux $releasever - Extras"
+    file: Rocky-Extras
+    gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
     gpgcheck: yes
 
 # Whether to enable EPEL repositories. This affects RedHat-based systems only.

etc/kayobe/environments/ci-aio/inventory/hosts

@@ -1,6 +1,9 @@
-# A single all-in-one controller/compute host.
+# A single all-in-one controller/compute/monitoring host.
 [controllers]
 controller0
 
 [compute:children]
 controllers
+
+[monitoring:children]
+controllers

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

@@ -11,3 +11,6 @@ openstack_service_rpc_workers: "1"
 
 docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}"
 docker_yum_gpgkey: "https://download.docker.com/linux/{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}/gpg"
+
+# Elasticsearch memory tuning
+es_heap_size: 1g

etc/kayobe/kolla.yml

@@ -230,7 +230,8 @@ kolla_build_blocks:
   bifrost_base_header: |
     ADD additions-archive /
   grafana_plugins_install: |
-    RUN grafana-cli plugins install vonage-status-panel
+    RUN grafana-cli plugins install vonage-status-panel \
+        && grafana-cli plugins install grafana-piechart-panel
   ironic_inspector_header: |
     ADD additions-archive /
 
@@ -453,7 +454,7 @@ kolla_build_args:
 #kolla_enable_ceilometer_ipmi:
 #kolla_enable_ceilometer_prometheus_pushgateway:
 #kolla_enable_cells:
-#kolla_enable_central_logging:
+kolla_enable_central_logging: true
 #kolla_enable_ceph_rgw:
 #kolla_enable_ceph_rgw_loadbalancer:
 #kolla_enable_cinder:
@@ -471,7 +472,7 @@ kolla_build_args:
 #kolla_enable_designate:
 #kolla_enable_destroy_images:
 #kolla_enable_elasticsearch:
-#kolla_enable_elasticsearch_curator:
+kolla_enable_elasticsearch_curator: true
 #kolla_enable_etcd:
 #kolla_enable_external_mariadb_load_balancer:
 #kolla_enable_fluentd:
@@ -481,7 +482,7 @@ kolla_build_args:
 #kolla_enable_glance_image_cache:
 #kolla_enable_gnocchi:
 #kolla_enable_gnocchi_statsd:
-#kolla_enable_grafana:
+kolla_enable_grafana: true
 #kolla_enable_hacluster:
 #kolla_enable_haproxy:
 #kolla_enable_haproxy_memcached:
@@ -570,7 +571,7 @@ kolla_build_args:
 #kolla_enable_ovn:
 #kolla_enable_ovs_dpdk:
 #kolla_enable_placement:
-#kolla_enable_prometheus:
+kolla_enable_prometheus: true
 #kolla_enable_prometheus_alertmanager:
 #kolla_enable_prometheus_blackbox_exporter:
 #kolla_enable_prometheus_cadvisor: