Skip to content

Commit 960dd71

Browse files
committed
wip
1 parent 3bd8c42 commit 960dd71

File tree

5 files changed

+21
-2
lines changed

5 files changed

+21
-2
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,16 @@ jobs:
264264
run: |
265265
docker image pull $KAYOBE_IMAGE
266266
267+
- name: Reboot
268+
run: |
269+
docker run -t --rm \
270+
-v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
271+
-e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
272+
${{ steps.kayobe_image.outputs.kayobe_image }} \
273+
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh etc/kayobe/ansible/reboot.yml -e reboot_with_bootstrap_user=true
274+
env:
275+
KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
276+
267277
- name: Run growroot
268278
run: |
269279
docker run -t --rm \

etc/kayobe/ansible/reboot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@
22
- name: Reboot the host
33
hosts: seed-hypervisor:seed:overcloud:infra-vms
44
serial: "{{ lookup('env', 'ANSIBLE_SERIAL') | default(1, true) }}"
5+
vars:
6+
reboot_with_bootstrap_user: false
7+
ansible_user: "{{ bootstrap_user if reboot_with_bootstrap_user else 'stack' }}"
58
tags:
69
- reboot
710
tasks:
811
- name: Reboot and wait
912
become: true
1013
reboot:
14+
ansible_user:

etc/kayobe/kolla-image-tags.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ kolla_image_tags:
66
openstack:
77
rocky-9: 2024.1-rocky-9-20240725T165045
88
ubuntu-jammy: 2024.1-ubuntu-jammy-20240725T165045
9+
heat:
10+
rocky-9: 2024.1-rocky-9-20240805T142526
11+
ubuntu-jammy: 2024.1-ubuntu-jammy-20240805T142526

etc/kayobe/stackhpc.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ stackhpc_kolla_source_version: "stackhpc/{{ openstack_release }}"
145145

146146
# Kolla Ansible source repository.
147147
stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
148-
stackhpc_kolla_ansible_source_version: "stackhpc/{{ openstack_release }}"
148+
# stackhpc_kolla_ansible_source_version: "stackhpc/{{ openstack_release }}"
149+
stackhpc_kolla_ansible_source_version: "fix-prometheus"
149150

150151
###############################################################################
151152
# Container image registry

terraform/aio/vm.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ resource "null_resource" "kayobe-aio" {
9292

9393
inline = [
9494
"#!/bin/sh",
95-
"echo 'connected!'"
95+
"echo 'connected!'",
96+
"sudo hostnamectl set-hostname $(sed s/.novalocal// /etc/hostname)"
9697
]
9798
}
9899
}

0 commit comments

Comments
 (0)