Skip to content

2023.1: zed merge #1230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Aug 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4dc1926
Stop changing permissions on files on Rocky 9
markgoddard Jul 22, 2024
09d226c
Stop changing permissions on files (#1119)
jovial Jul 12, 2024
67530fd
Merge pull request #1189 from stackhpc/zed-yoga-merge
markgoddard Jul 24, 2024
376928e
CI: Allow logging of Rally/Tempest
markgoddard Sep 14, 2023
1a1210c
Merge pull request #1193 from stackhpc/rally-logging
priteau Jul 24, 2024
d750747
Fix CVE-2024-40767
priteau Jul 24, 2024
5b1f040
CI: Bump AIO root volume size to 40GB
m-bull Jul 24, 2024
cdfad6a
Merge pull request #1195 from stackhpc/yoga-bump=aio-disk
markgoddard Jul 24, 2024
41812df
Merge branch 'stackhpc/yoga' into yoga-ossa-2024-002
m-bull Jul 24, 2024
e25cc4c
Merge pull request #1191 from stackhpc/yoga-ossa-2024-002
priteau Jul 24, 2024
97c3d43
Build nova from our fork
priteau Jul 25, 2024
41936eb
Merge pull request #1200 from stackhpc/zed-nova
markgoddard Jul 25, 2024
4fb938c
Prevent hanging before reboot on systems running molly-guard
markgoddard Aug 5, 2024
382f735
Add reboot timeout to reboot playbook
markgoddard Aug 5, 2024
9b9971d
Merge pull request #1209 from stackhpc/yoga-molly-guard
markgoddard Aug 5, 2024
f8ed8c1
Merge pull request #1180 from stackhpc/yoga-backports
markgoddard Aug 9, 2024
d1c589b
CIS: Remove always tag from include_role tasks
markgoddard Aug 9, 2024
2aa9d60
Merge pull request #1220 from stackhpc/yoga-cis-no-always
markgoddard Aug 16, 2024
07fdce6
Merge stackhpc/yoga into stackhpc/zed
markgoddard Aug 16, 2024
b300dd1
Merge stackhpc/zed into stackhpc/2023.1
markgoddard Aug 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions etc/kayobe/ansible/cis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@
- include_role:
name: ansible-lockdown.rhel9_cis
when: ansible_facts.os_family == 'RedHat' and ansible_facts.distribution_major_version == '9'
tags: always

- include_role:
name: ansible-lockdown.ubuntu22_cis
when: ansible_facts.distribution == 'Ubuntu' and ansible_facts.distribution_major_version == '22'
tags: always
11 changes: 11 additions & 0 deletions etc/kayobe/ansible/reboot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
serial: "{{ lookup('env', 'ANSIBLE_SERIAL') | default(1, true) }}"
gather_facts: false
vars:
reboot_timeout_s: "{{ 20 * 60 }}"
reboot_with_bootstrap_user: false
ansible_user: "{{ bootstrap_user if reboot_with_bootstrap_user | bool else kayobe_ansible_user }}"
ansible_ssh_common_args: "{{ '-o StrictHostKeyChecking=no' if reboot_with_bootstrap_user | bool else '' }}"
Expand All @@ -14,3 +15,13 @@
- name: Reboot and wait
become: true
reboot:
reboot_timeout: "{{ reboot_timeout_s }}"
search_paths:
# Systems running molly-guard hang waiting for confirmation before rebooting without this.
- "/lib/molly-guard"
# Default list:
- "/sbin"
- "/bin"
- "/usr/sbin"
- "/usr/bin"
- "/usr/local/sbin"
18 changes: 18 additions & 0 deletions etc/kayobe/ansible/ubuntu-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@
reboot:
reboot_timeout: "{{ reboot_timeout_s }}"
connect_timeout: 600
search_paths:
# Systems running molly-guard hang waiting for confirmation before rebooting without this.
- "/lib/molly-guard"
# Default list:
- "/sbin"
- "/bin"
- "/usr/sbin"
- "/usr/bin"
- "/usr/local/sbin"
become: true
when: file_status.stat.exists

Expand Down Expand Up @@ -101,6 +110,15 @@
reboot:
reboot_timeout: "{{ reboot_timeout_s }}"
connect_timeout: 600
search_paths:
# Systems running molly-guard hang waiting for confirmation before rebooting without this.
- "/lib/molly-guard"
# Default list:
- "/sbin"
- "/bin"
- "/usr/sbin"
- "/usr/bin"
- "/usr/local/sbin"
become: true

- name: Update distribution facts
Expand Down
2 changes: 1 addition & 1 deletion terraform/aio/vm.tf
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ variable "aio_vm_subnet" {

variable "aio_vm_volume_size" {
type = number
default = 35
default = 40
}

variable "aio_vm_tags" {
Expand Down
Loading