Skip to content

Commit 8de89d7

Browse files
authored
Merge pull request #980 from stackhpc/yoga-upstream-merge
yoga: merge upstream unmaintained/yoga
2 parents 6b347d2 + bc3e75f commit 8de89d7

18 files changed

+63
-47
lines changed

.github/workflows/overcloud-host-image-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
id: openstack_release
5151
run: |
5252
BRANCH=$(awk -F'=' '/defaultbranch/ {print $2}' .gitreview)
53-
echo "openstack_release=${BRANCH}" | sed "s|stable/||" >> $GITHUB_OUTPUT
53+
echo "openstack_release=${BRANCH}" | sed -E "s,(stable|unmaintained)/,," >> $GITHUB_OUTPUT
5454
5555
# Generate a tag to apply to all built overcloud host images.
5656
- name: Generate overcloud host image tag

.github/workflows/overcloud-host-image-promote.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
id: openstack_release
4444
run: |
4545
BRANCH=$(awk -F'=' '/defaultbranch/ {print $2}' .gitreview)
46-
echo "openstack_release=${BRANCH}" | sed "s|stable/||" >> $GITHUB_OUTPUT
46+
echo "openstack_release=${BRANCH}" | sed -E "s,(stable|unmaintained)/,," >> $GITHUB_OUTPUT
4747
working-directory: src/kayobe-config
4848

4949
- name: Clone StackHPC Kayobe repository

.github/workflows/overcloud-host-image-upload.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
id: openstack_release
6060
run: |
6161
BRANCH=$(awk -F'=' '/defaultbranch/ {print $2}' src/kayobe-config/.gitreview)
62-
echo "openstack_release=${BRANCH}" | sed "s|stable/||" >> $GITHUB_OUTPUT
62+
echo "openstack_release=${BRANCH}" | sed -E "s,(stable|unmaintained)/,," >> $GITHUB_OUTPUT
6363
6464
- name: Clone StackHPC Kayobe repository
6565
uses: actions/checkout@v4

.github/workflows/stackhpc-ci-cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
id: openstack_release
3131
run: |
3232
BRANCH=$(awk -F'=' '/defaultbranch/ {print $2}' src/kayobe-config/.gitreview)
33-
echo "openstack_release=${BRANCH}" | sed "s|stable/||" >> $GITHUB_OUTPUT
33+
echo "openstack_release=${BRANCH}" | sed -E "s,(stable|unmaintained)/,," >> $GITHUB_OUTPUT
3434
3535
- name: Install OpenStack client
3636
run: |

.github/workflows/stackhpc-container-image-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
id: openstack_release
6666
run: |
6767
BRANCH=$(awk -F'=' '/defaultbranch/ {print $2}' .gitreview)
68-
echo "openstack_release=${BRANCH}" | sed "s|stable/||" >> $GITHUB_OUTPUT
68+
echo "openstack_release=${BRANCH}" | sed -E "s,(stable|unmaintained)/,," >> $GITHUB_OUTPUT
6969
7070
# Generate a tag to apply to all built container images.
7171
# Without this, each kayobe * container image build command would use a different tag.

.gitreview

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
host=review.opendev.org
33
port=29418
44
project=openstack/kayobe-config.git
5-
defaultbranch=stable/yoga
5+
defaultbranch=unmaintained/yoga

etc/kayobe/bifrost.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@
116116
# Ironic inspector deployment ramdisk location.
117117
#kolla_bifrost_inspector_deploy_ramdisk:
118118

119+
# Ironic inspector legacy deployment kernel location.
120+
#kolla_bifrost_inspector_legacy_deploy_kernel:
121+
119122
# Timeout of hardware inspection on overcloud nodes, in seconds. Default is
120123
# {{ inspector_inspection_timeout }}.
121124
#kolla_bifrost_inspection_timeout:

etc/kayobe/compute.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@
6363
###############################################################################
6464
# Compute node LVM configuration.
6565

66-
# List of compute volume groups. See mrlesmithjr.manage-lvm role for
66+
# List of compute volume groups. See mrlesmithjr.manage_lvm role for
6767
# format.
6868
#compute_lvm_groups:
6969

70-
# Default list of compute volume groups. See mrlesmithjr.manage-lvm role for
70+
# Default list of compute volume groups. See mrlesmithjr.manage_lvm role for
7171
# format.
7272
#compute_lvm_groups_default:
7373

74-
# Additional list of compute volume groups. See mrlesmithjr.manage-lvm role
74+
# Additional list of compute volume groups. See mrlesmithjr.manage_lvm role
7575
# for format.
7676
#compute_lvm_groups_extra:
7777

@@ -82,7 +82,7 @@
8282
# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
8383
#compute_lvm_group_data_enabled:
8484

85-
# Compute LVM volume group for data. See mrlesmithjr.manage-lvm role for
85+
# Compute LVM volume group for data. See mrlesmithjr.manage_lvm role for
8686
# format.
8787
#compute_lvm_group_data:
8888

etc/kayobe/controllers.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@
7272
###############################################################################
7373
# Controller node LVM configuration.
7474

75-
# List of controller volume groups. See mrlesmithjr.manage-lvm role for
75+
# List of controller volume groups. See mrlesmithjr.manage_lvm role for
7676
# format.
7777
#controller_lvm_groups:
7878

79-
# Default list of controller volume groups. See mrlesmithjr.manage-lvm role for
79+
# Default list of controller volume groups. See mrlesmithjr.manage_lvm role for
8080
# format.
8181
#controller_lvm_groups_default:
8282

83-
# Additional list of controller volume groups. See mrlesmithjr.manage-lvm role
83+
# Additional list of controller volume groups. See mrlesmithjr.manage_lvm role
8484
# for format.
8585
#controller_lvm_groups_extra:
8686

@@ -91,7 +91,7 @@
9191
# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
9292
#controller_lvm_group_data_enabled:
9393

94-
# Controller LVM volume group for data. See mrlesmithjr.manage-lvm role for
94+
# Controller LVM volume group for data. See mrlesmithjr.manage_lvm role for
9595
# format.
9696
#controller_lvm_group_data:
9797

etc/kayobe/globals.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
###############################################################################
55
# Local path configuration (Ansible control host).
66

7-
# Path to Kayobe configuration directory on Ansible control host, with an
8-
# environment path appended if kayobe_environment is set.
7+
# Path to Kayobe configuration directory on Ansible control host.
98
#kayobe_config_path:
109

1110
# Name of Kayobe environment to use. Default is $KAYOBE_ENVIRONMENT, or an
@@ -50,7 +49,7 @@
5049
#os_distribution:
5150

5251
# OS release. Valid options are "8-stream" when os_distribution is "centos", or
53-
# "8" when os_distribution is "rocky", or "focal" and "jammy" when
52+
# "8" or "9" when os_distribution is "rocky", or "focal" and "jammy" when
5453
# os_distribution is "ubuntu".
5554
#os_release:
5655

0 commit comments

Comments
 (0)