Skip to content

Commit b7d0b78

Browse files
committed
Importing the changes made to be able to deploy MN.
1 parent b257275 commit b7d0b78

8 files changed

+200
-187
lines changed

ansible/ansible.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ host_key_checking = False
55
pipelining = True
66
forks = 30
77
deprecation_warnings=False
8+
roles_path = ../roles
89

910
[ssh_connection]
1011
ssh_args = -o ControlMaster=auto -o ControlPersist=60s

ansible/fix-homedir-ownership.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- name: Fix Home Directory Ownership
3-
hosts: all
3+
hosts: all, !localhost
44
gather_facts: false
55
vars:
66
# At the time of running this playbook the home directory is not owned by the user.
@@ -16,7 +16,7 @@
1616
gather_subset:
1717
- user_dir
1818

19-
- name: Ensure homedir is owned by {{ ansible_user }}
19+
- name: Ensure homedir is owned by "{{ ansible_user }}"
2020
ansible.builtin.file:
2121
dest: "{{ ansible_env.HOME }}"
2222
state: directory

ansible/vars/defaults.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
src_directory: "{{ ansible_env.HOME }}/src"
33

44
kayobe_config_repo: https://github.com/stackhpc/stackhpc-kayobe-config.git
5-
kayobe_config_version: "{{ openstack_version }}"
5+
kayobe_config_version: "{{ openstack_config_version }}"
66
kayobe_config_name: kayobe-config
77
kayobe_config_environment: ci-multinode
88

@@ -16,9 +16,7 @@ openstack_config_name: openstack-config
1616

1717
vault_password_path: "~/vault.password"
1818

19-
ssh_key_path:
20-
21-
vxlan_vni:
19+
ssh_key_path: "{{ cluster_ssh_private_key_file }}"
2220

2321
root_domain: sms-lab.cloud
2422

group_vars/openstack.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ terraform_project_path: "{{ playbook_dir }}"
2323
# Valid values are 'present' and 'absent'
2424
terraform_state: "{{ cluster_state | default('present') }}"
2525

26-
26+
cluster_ssh_user: "{{ ssh_user }}"

multinode-infra-app.yml renamed to multinode-app.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
src: "{{ playbook_dir }}/templates/userdata.cfg.tpl.j2"
1717
dest: "{{ playbook_dir }}/templates/userdata.cfg.tpl"
1818

19-
# Provision the infrastructure The CaaS puts hosts for accessing the OpenStack
19+
20+
# Provision the infrastructure
21+
22+
# The CaaS puts hosts for accessing the OpenStack
2023
# API into the 'openstack' group
2124
- hosts: openstack
2225
roles:

terraform.tfvars.j2

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@ prefix = "{{ cluster_name }}"
22

33
ansible_control_vm_flavor = "general.v1.small"
44
ansible_control_vm_name = "ansible-control"
5-
ansible_control_disk_size = 25
5+
ansible_control_disk_size = 100
66

77
seed_vm_flavor = "general.v1.small"
8-
seed_disk_size = 25
8+
seed_disk_size = 100
99

1010
multinode_flavor = "general.v1.medium"
11-
# multinode_image = "rocky9-lvm"
1211
multinode_image = "{{ multinode_image }}"
1312
multinode_keypair = "MaxMNKP"
1413
multinode_vm_network = "stackhpc-ipv4-geneve"
1514
multinode_vm_subnet = "stackhpc-ipv4-geneve-subnet"
1615
compute_count = "2"
1716
controller_count = "3"
18-
compute_disk_size = 25
19-
controller_disk_size = 25
17+
compute_disk_size = 100
18+
controller_disk_size = 100
2019

2120
ssh_public_key = "{{ cluster_user_ssh_public_key }}"
21+
ssh_user = "{{ ssh_user }}"
2222

2323
storage_count = "3"
2424
storage_flavor = "general.v1.small"
25-
storage_disk_size = 25
25+
storage_disk_size = 100
2626

2727
deploy_wazuh = false
2828
infra_vm_flavor = "general.v1.small"
29-
infra_vm_disk_size = 25
29+
infra_vm_disk_size = 100

ui-meta/multinode-appliance.yml

+183
Large diffs are not rendered by default.

ui-meta/multinode-infra-appliance.yml

-172
This file was deleted.

0 commit comments

Comments
 (0)