Skip to content

Commit 138cf36

Browse files
committed
testo
1 parent 9ea95e6 commit 138cf36

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,9 @@ jobs:
172172
- name: Write Terraform network interface config
173173
run: |
174174
mkdir -p etc/kayobe/environments/$KAYOBE_ENVIRONMENT/inventory/group_vars/seed
175-
cat << EOF > etc/kayobe/environments/$KAYOBE_ENVIRONMENT/inventory/group_vars/seed/tf-network-interfaces
175+
cat << EOF > etc/kayobe/environments/$KAYOBE_ENVIRONMENT/inventory/group_vars/seed/network-interfaces
176176
admin_interface: "{{ access_interface.value }}"
177+
aio_interface: "{{ access_interface.value }}"
177178
EOF
178179
179180
- name: Manage SSH keys

etc/kayobe/ansible/openstack-host-image-upload.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@
4040
disk_format: qcow2
4141
state: present
4242
filename: "{{ local_image_path }}"
43+
visibility: "shared"

etc/kayobe/environments/ci-builder/inventory/group_vars/seed/network-interfaces

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
###############################################################################
33
# Network interface definitions for the controller group.
44

5-
# Seed interface on all-in-one network.
6-
aio_interface: eth0
5+
# Controller interface on all-in-one network.
6+
aio_interface: breth1
7+
# Use dummy1 if it exists, otherwise the bridge will have no ports.
8+
aio_bridge_ports: "{{ ['dummy1'] if 'dummy1' in hostvars[inventory_hostname].ansible_facts else [] }}"
9+
10+
###############################################################################
11+
# Dummy variable to allow Ansible to accept this file.
12+
workaround_ansible_issue_8743: yes
13+

etc/kayobe/overcloud-dib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ overcloud_dib_host_packages_extra:
7171
overcloud_dib_git_elements_extra:
7272
- repo: "https://github.com/stackhpc/stackhpc-image-elements"
7373
local: "{{ source_checkout_path }}/stackhpc-image-elements"
74-
version: "v1.6.1"
74+
version: "fix-rocky-containerfile"
7575
elements_path: "elements"
7676

7777
# List of git repositories containing Diskimage Builder (DIB) elements. See

0 commit comments

Comments
 (0)