Skip to content

Commit acf37ba

Browse files
assumptionsandgassumptionsandg
authored
Merge branch 'stackhpc/2024.1' into baremetal-hypervisor
2 parents 42d1bbb + c7a478b commit acf37ba

12 files changed

+87
-8
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,9 @@ jobs:
468468
-v $(pwd)/sct-results:/stack/sct-results \
469469
-e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
470470
$KAYOBE_IMAGE \
471-
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/stackhpc-cloud-tests.yml' -e sct_version=${{ inputs.stackhpc_cloud_tests_version }}
471+
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/stackhpc-cloud-tests.yml' \
472+
${{ inputs.upgrade && '-e selinux_state=disabled' }} \
473+
-e sct_version=${{ inputs.stackhpc_cloud_tests_version }}
472474
env:
473475
KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
474476

‎doc/source/usage.rst‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,51 @@ configuration:
5757
The intention is to avoid merge conflicts where possible, but there may be
5858
cases where this is difficult. We are open to discussion on how best to
5959
approach this on both sides.
60+
61+
Beokay
62+
------
63+
64+
`Beokay <https://github.com/stackhpc/beokay>` is a tool to manage Kayobe
65+
environments. This can create new StackHPC Kayobe environments and
66+
ensure StackHPC Kayobe Configuration dependencies are from the correct repositories and
67+
are up-to-date:
68+
69+
To create a Beokay environment using the base configuration, for the latest release:
70+
71+
.. code-block:: console
72+
73+
beokay.py create \
74+
--base-path skc-environment \
75+
--kayobe-config-repo https://github.com/stackhpc/stackhpc-kayobe-config.git \
76+
--kayobe-config-branch |current_release_git_branch_name| \
77+
--kayobe-in-requirements
78+
79+
Kayobe environments can also be specified, for example, to create an AIO environment:
80+
81+
.. code-block:: console
82+
83+
beokay.py create \
84+
--base-path skc-aio-environment \
85+
--kayobe-config-repo https://github.com/stackhpc/stackhpc-kayobe-config.git \
86+
--kayobe-config-branch |current_release_git_branch_name| \
87+
--kayobe-config-env-name ci-aio \
88+
--vault-password-file ~/vault-pw \
89+
--kayobe-in-requirements
90+
91+
When Beokay environments are no longer required, they can be deleted by running:
92+
93+
.. code-block:: console
94+
95+
beokay.py destroy \
96+
--base-path skc-environment
97+
98+
Specific Kayobe commands can also be run via Beokay, for example, to run a Kolla
99+
service deployment on overcloud hosts:
100+
101+
.. code-block:: console
102+
103+
beokay.py run \
104+
'kayobe overcloud service deploy' \
105+
--base-path skc-aio-environment \
106+
--kayobe-config-env-name ci-aio \
107+
--vault-password-file ~/vault-pw

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ kolla_enable_octavia: true
2929
kolla_enable_opensearch: true
3030
kolla_enable_prometheus: true
3131
kolla_enable_redis: true
32+
kolla_enable_skyline: true
3233
kolla_build_neutron_ovs: true
3334

3435
###############################################################################

‎etc/kayobe/kolla-image-tags.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,9 @@ kolla_image_tags:
4848
ovn:
4949
rocky-9: 2024.1-rocky-9-20250219T113722
5050
ubuntu-jammy: 2024.1-ubuntu-jammy-20250219T113722
51+
skyline_apiserver:
52+
rocky-9: 2024.1-rocky-9-20250408T133253
53+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250408T133253
54+
skyline_console:
55+
rocky-9: 2024.1-rocky-9-20250408T133253
56+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250408T133253

‎etc/kayobe/kolla.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ kolla_enable_heat: false
639639
#kolla_enable_influxdb:
640640
#kolla_enable_ironic:
641641
#kolla_enable_ironic_neutron_agent:
642-
#kolla_enable_ironic_prometheus_exporter:
642+
kolla_enable_ironic_prometheus_exporter: false
643643
#kolla_enable_iscsid:
644644
#kolla_enable_keepalived:
645645
#kolla_enable_keystone:

‎etc/kayobe/pulp-host-image-versions.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Overcloud host image versioning tags
33
# These images must be in SMS, since they are used by our AIO CI runners
44
stackhpc_rocky_9_overcloud_host_image_version: "2024.1-20241209T151515"
5-
stackhpc_ubuntu_jammy_overcloud_host_image_version: "2024.1-20250116T133659"
5+
stackhpc_ubuntu_jammy_overcloud_host_image_version: "2024.1-20250408T082408"

‎etc/kayobe/pulp-repo-versions.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ stackhpc_pulp_repo_rocky_9_5_crb_version: 20241217T005008
4646
stackhpc_pulp_repo_rocky_9_5_extras_version: 20241216T004230
4747
stackhpc_pulp_repo_rocky_9_5_highavailability_version: 20241202T003154
4848
stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20241127T003858
49-
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20241217T045049
50-
stackhpc_pulp_repo_ubuntu_jammy_security_version: 20241217T071258
51-
stackhpc_pulp_repo_ubuntu_jammy_version: 20241217T071258
49+
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20250408T063025
50+
stackhpc_pulp_repo_ubuntu_jammy_security_version: 20250408T085614
51+
stackhpc_pulp_repo_ubuntu_jammy_version: 20250408T085614
5252
stackhpc_pulp_repo_rhel_9_4_doca_version: 20241211T153620
5353
stackhpc_pulp_repo_rhel_9_4_doca_modules_version: 20241213T112245
5454
stackhpc_pulp_repo_rhel_9_5_doca_version: 20241211T171301

‎etc/kayobe/pulp.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,8 +536,8 @@ stackhpc_pulp_images_kolla:
536536
- ovn-controller
537537
- ovn-nb-db-server
538538
- ovn-northd
539-
- ovn-sb-db-server
540539
- ovn-sb-db-relay
540+
- ovn-sb-db-server
541541
- placement-api
542542
- prometheus-alertmanager
543543
- prometheus-blackbox-exporter
@@ -554,6 +554,8 @@ stackhpc_pulp_images_kolla:
554554
- rabbitmq
555555
- redis
556556
- redis-sentinel
557+
- skyline-apiserver
558+
- skyline-console
557559

558560
# List of images for each base distribution which should not/cannot be built.
559561
stackhpc_kolla_unbuildable_images:

‎etc/kayobe/trivy/allowed-vulnerabilities.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ fluentd_allowed_vulnerabilities:
1616
- CVE-2024-27280
1717
grafana_allowed_vulnerabilities:
1818
- CVE-2024-8986
19-
19+
skyline_apiserver_allowed_vulnerabilities:
20+
- CVE-2024-33663
2021

2122
###############################################################################
2223
# Dummy variable to allow Ansible to accept this file.

‎releasenotes/notes/disable-ironic-prometheus-exporter-894d98022a1e926d.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
features:
3+
- |
4+
The Ironic Prometheus Exporter is now disabled by default as redfish exporter
5+
is preferred. If you need to use the Ironic Prometheus Exporter, you can
6+
enable it by setting the `kolla_enable_ironic_prometheus_exporter`
7+
option to `true`.

0 commit comments

Comments
 (0)