Skip to content

Commit c8b22aa

Browse files
markgoddardmarkgoddard
authored
Merge branch 'stackhpc/wallaby' into upstream/wallaby-2022-10-17
2 parents 9af442e + ecf9ef4 commit c8b22aa

File tree

199 files changed

+5474
-283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+5474
-283
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @stackhpc/kayobe

‎.github/workflows/tag-and-release.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
name: Tag & Release
3+
'on':
4+
push:
5+
branches:
6+
- stackhpc/wallaby
7+
permissions:
8+
contents: write
9+
jobs:
10+
tag-and-release:
11+
uses: stackhpc/.github/.github/workflows/tag-and-release.yml@main

‎.github/workflows/tox.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
name: Tox Continuous Integration
3+
'on':
4+
pull_request:
5+
jobs:
6+
tox:
7+
uses: stackhpc/.github/.github/workflows/tox.yml@main

‎ansible/action_plugins/merge_configs.py‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Copyright (c) 2021 StackHPC Ltd.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License"); you may
4+
# not use this file except in compliance with the License. You may obtain
5+
# a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
11+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
12+
# License for the specific language governing permissions and limitations
13+
# under the License.
14+
15+
__metaclass__ = type
16+
17+
import kayobe.plugins.action.merge_configs
18+
19+
ActionModule = kayobe.plugins.action.merge_configs.ActionModule

‎ansible/action_plugins/merge_yaml.py‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Copyright (c) 2021 StackHPC Ltd.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License"); you may
4+
# not use this file except in compliance with the License. You may obtain
5+
# a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
11+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
12+
# License for the specific language governing permissions and limitations
13+
# under the License.
14+
15+
__metaclass__ = type
16+
17+
import kayobe.plugins.action.merge_yaml
18+
19+
ActionModule = kayobe.plugins.action.merge_yaml.ActionModule

‎ansible/apt.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- name: Ensure APT is configured
3-
hosts: seed-hypervisor:seed:overcloud
3+
hosts: seed-hypervisor:seed:overcloud:infra-vms
44
vars:
55
ansible_python_interpreter: /usr/bin/python3
66
tags:

‎ansible/compute-libvirt-host.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
---
2+
- name: Ensure the libvirt daemon is configured
3+
hosts: compute
4+
tags:
5+
- libvirt-host
6+
tasks:
7+
- name: Ensure Ceph package repository is available
8+
package:
9+
name: "centos-release-ceph-{{ compute_libvirt_ceph_repo_release }}"
10+
state: present
11+
when:
12+
- compute_libvirt_enabled | bool
13+
- ansible_facts.distribution in ['CentOS', 'Rocky']
14+
- compute_libvirt_ceph_repo_install | bool
15+
become: true
16+
17+
- name: Include stackhpc.libvirt-host role
18+
include_role:
19+
name: stackhpc.libvirt-host
20+
vars:
21+
libvirt_host_libvirtd_conf: "{{ compute_libvirt_conf }}"
22+
libvirt_host_qemu_conf: "{{ compute_qemu_conf }}"
23+
libvirt_host_enable_sasl_support: "{{ compute_libvirt_enable_sasl | bool }}"
24+
libvirt_host_sasl_authname: nova
25+
libvirt_host_sasl_password: "{{ compute_libvirt_sasl_password }}"
26+
libvirt_host_tcp_listen: "{{ not compute_libvirt_enable_tls | bool }}"
27+
libvirt_host_tcp_listen_address: "{{ internal_net_name | net_ip }}:16509"
28+
libvirt_host_tls_listen: "{{ compute_libvirt_enable_tls | bool }}"
29+
libvirt_host_tls_listen_address: "{{ internal_net_name | net_ip }}:16514"
30+
# TLS server and client certificates.
31+
libvirt_host_tls_server_cert: >-
32+
{{ lookup('file', lookup('first_found', lookup_params | combine({'files': ['servercert.pem']})))
33+
if libvirt_host_tls_listen | default(False) | bool else '' }}
34+
libvirt_host_tls_server_key: >-
35+
{{ lookup('file', lookup('first_found', lookup_params | combine({'files': ['serverkey.pem']})))
36+
if libvirt_host_tls_listen | default(False) | bool else '' }}
37+
libvirt_host_tls_client_cert: >-
38+
{{ lookup('file', lookup('first_found', lookup_params | combine({'files': ['clientcert.pem']})))
39+
if libvirt_host_tls_listen | default(False) | bool else '' }}
40+
libvirt_host_tls_client_key: >-
41+
{{ lookup('file', lookup('first_found', lookup_params | combine({'files': ['clientkey.pem']})))
42+
if libvirt_host_tls_listen | default(False) | bool else '' }}
43+
libvirt_host_tls_cacert: >-
44+
{{ lookup('file', lookup('first_found', lookup_params | combine({'files': ['cacert.pem']})))
45+
if libvirt_host_tls_listen | default(False) | bool else '' }}
46+
lookup_params:
47+
paths: "{{ libvirt_tls_cert_paths }}"
48+
skip: true
49+
# Support loading libvirt TLS certificates & keys from per-host and
50+
# global locations.
51+
libvirt_tls_cert_paths: >-
52+
{{ (libvirt_tls_cert_dirs | unique | product([inventory_hostname]) | map('path_join') | list +
53+
libvirt_tls_cert_dirs | unique | list) | list }}
54+
libvirt_tls_cert_dirs:
55+
- "{{ kayobe_env_config_path }}/certificates/libvirt"
56+
- "{{ kayobe_config_path }}/certificates/libvirt"
57+
libvirt_host_enable_efi_support: true
58+
when:
59+
- compute_libvirt_enabled | bool

‎ansible/dev-tools.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- name: Ensure development tools are installed
3-
hosts: seed-hypervisor:seed:overcloud
3+
hosts: seed-hypervisor:seed:overcloud:infra-vms
44
tags:
55
- dev-tools
66
roles:

‎ansible/disable-cloud-init.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# In some cases cloud-init reconfigure automatically network interface
55
# and cause some issues in network configuration
66
- name: Disable Cloud-init service
7-
hosts: overcloud
7+
hosts: overcloud:infra-vms
88
tags:
99
- disable-cloud-init
1010
roles:

‎ansible/disable-glean.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# servers but gets in the way after this as it tries to enable all network
44
# interfaces. In some cases this can lead to timeouts.
55
- name: Ensure Glean is disabled and its artifacts are removed
6-
hosts: seed:overcloud
6+
hosts: seed:overcloud:infra-vms
77
tags:
88
- disable-glean
99
roles:

0 commit comments

Comments
 (0)