Skip to content

Commit d95dfb1

Browse files
committed
Add config for wazuh in multinode deployments
1 parent 4c868dd commit d95dfb1

File tree

10 files changed

+66
-5
lines changed

10 files changed

+66
-5
lines changed

etc/kayobe/ansible/configure-vxlan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- name: Configure VXLAN
3-
hosts: controllers,compute,seed,storage
3+
hosts: "{{ configure_vxlan_playbook_hosts | default('seed,compute,controllers,storage') }}"
44
gather_facts: true
55
vars:
66
ansible_user: "{{ bootstrap_user }}"

etc/kayobe/ansible/fix-networking.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- name: Fix networking
3-
hosts: seed,compute,controllers,storage
3+
hosts: "{{ fix_networking_playbook_hosts | default('seed,compute,controllers,storage') }}"
44
gather_facts: false
55
vars:
66
ansible_user: "{{ bootstrap_user }}"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
growroot_group: "seed:overcloud"
2+
growroot_group: "seed:overcloud:infra-vms"
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
infra_vm_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cloud-user' }}"
3+
# List of storage volume groups. See mrlesmithjr.manage-lvm role for
4+
# format.
5+
infra_vm_lvm_groups:
6+
- "{{ stackhpc_lvm_group_rootvg }}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
###############################################################################
33
# Network interface definitions for the seed group.
44

5-
admin_oc_interface: "{{ 'ens2' if (os_distribution == 'ubuntu' and ansible_facts['distribution_release'] != 'jammy') else 'ens3' }}"
5+
admin_oc_interface: "{{ ansible_facts.default_ipv4.interface }}"
66

77
provision_oc_interface: "{{ vxlan_interfaces[0].device}}.{{ provision_oc_vlan }}"
88

etc/kayobe/environments/ci-multinode/inventory/group_vars/storage/network-interfaces

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
###############################################################################
33
# Network interface definitions for the storage group.
44

5-
admin_oc_interface: "ens3"
5+
admin_oc_interface: "{{ ansible_facts.default_ipv4.interface }}"
66

77
internal_interface: "{{ vxlan_interfaces[0].device }}.{{ internal_vlan }}"
88

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
# List of extra LVs to include in the rootvg VG.
3+
stackhpc_lvm_group_rootvg_lvs_extra:
4+
- "{{ stackhpc_lvm_lv_docker }}"
5+
6+
###############################################################################
7+
# StackHPC LVM Logical Volume (LV) configuration.
8+
9+
# StackHPC LVM lv_swap LV size.
10+
stackhpc_lvm_lv_swap_size: 1g
11+
12+
# StackHPC LVM lv_root LV size.
13+
stackhpc_lvm_lv_root_size: 10g
14+
15+
# StackHPC LVM lv_tmp LV size.
16+
stackhpc_lvm_lv_tmp_size: 10g
17+
18+
# StackHPC LVM lv_var LV size.
19+
stackhpc_lvm_lv_var_size: 20g
20+
21+
# StackHPC LVM lv_var_tmp LV size.
22+
stackhpc_lvm_lv_var_tmp_size: 5g
23+
24+
# StackHPC LVM lv_log LV size.
25+
stackhpc_lvm_lv_log_size: 10g
26+
27+
# StackHPC LVM lv_audit LV size.
28+
stackhpc_lvm_lv_audit_size: 5g
29+
30+
# StackHPC LVM lv_home LV size.
31+
stackhpc_lvm_lv_home_size: 5g
32+
33+
# StackHPC LVM lv_docker LV size.
34+
stackhpc_lvm_lv_docker_size: 75%FREE
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
###############################################################################
3+
# Network interface definitions for the wazuh-manager group.
4+
5+
admin_oc_interface: "{{ ansible_facts.default_ipv4.interface }}"
6+
7+
###############################################################################
8+
# Dummy variable to allow Ansible to accept this file.
9+
workaround_ansible_issue_8743: yes
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
# Not using provision_oc, use admin_oc instead
3+
wazuh_manager_ip: "{{ admin_oc_net_name | net_ip }}"
4+
indexer_network_host: "{{ admin_oc_net_name | net_ip }}"

etc/kayobe/environments/ci-multinode/stackhpc-ci.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ kolla_docker_namespace: stackhpc-dev
1212
# hostname.
1313
resolv_is_managed: false
1414

15+
###############################################################################
16+
# Hook playbook configuration.
17+
18+
# Infrastructure VMs in a multinode deployment are deployed as separate hosts,
19+
# so need the same extra configuration as any other host.
20+
fix_networking_playbook_hosts: 'seed,compute,controllers,storage,infra-vms'
21+
configure_vxlan_playbook_hosts: 'seed,compute,controllers,storage,infra-vms'
22+
1523
###############################################################################
1624
# StackHPC configuration.
1725

0 commit comments

Comments
 (0)