Skip to content

Commit bd91186

Browse files
authored
Multinode xena (#248)
* feat: copy `ci-multinode` from PR `#246` * feat: copy `ansible` from PR `#246` * revert: configure-aio-resources.yml to `da05599` * feat: actually copy contents of `ci-multinode` For some reason the previous commit does not contain the important changes to the configuration. This commit fixes that. * feat: include `.automation.conf` from PR `#246` * revert: `stackhpc-ci` back to `stackhpc/xena` * feat: update address of `pulp-server` * feat: bump `stackhpc.cephadm` version * feat: `haproxy` group has been replaced with `loadbalancer` * fix: ensure `cephadm_host_labels` is defined * feat: reduce concurrency and remove load list * feat: increase `max_microversion` * fix: restore order to `requirements.yml` * fix: README has been moved * fix: remove unused collection * fix: add missing new line * feat: disable some unwanted service within ci-multinode * fix: remove extra blank lines * feat: revert `TEMPEST_CONCURRENCY` to two * feat: load `ci-multinode` tempest settings conditionally Firstly, the skip-list has been renamed from `tempest-full` to `ci-multinode` as this list would be environment specific. Secondly the `config.sh` script now contains a conditional for the `ci-multinode` environment allowing for the test list and concurrency settings to be loaded without impacting other environments. * fix: use `HTTP` dashboard URL over `HTTPS` * fix: reduce multinode tempest concurrency * feat: bump `stackhpc.cephadm` collection version * feat: remove unecessary comment
1 parent 2ccb7bd commit bd91186

30 files changed

+2000
-61
lines changed

.automation.conf/config.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ if [ ! -z ${KAYOBE_ENVIRONMENT:+x} ]; then
1919
# Seem to get servers failing to spawn with higher concurrency
2020
export TEMPEST_CONCURRENCY=1
2121
fi
22+
if [[ "$KAYOBE_ENVIRONMENT" =~ "ci-multinode" ]]; then
23+
export KAYOBE_AUTOMATION_TEMPEST_LOADLIST=tempest-full
24+
export KAYOBE_AUTOMATION_TEMPEST_SKIPLIST=ci-multinode
25+
fi
2226
fi
2327

2428
if [[ -z "${KAYOBE_AUTOMATION_TEMPEST_CONF_OVERRIDES:+x}" ]] || [[ ! -e "${KAYOBE_AUTOMATION_TEMPEST_CONF_OVERRIDES}" ]]; then

.automation.conf/tempest/load-lists/tempest-full

Lines changed: 1601 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_subnet_details.*: "Cirros image doesn't have '/var/run/udhcpc.eth0.pid"
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
[DEFAULT]
2+
openstack_client_http_timeout = 300
3+
4+
[auth]
5+
compute_quotas = cores:-1,ram:-1
6+
7+
[identity]
8+
v3_endpoint_type = publicURL
9+
10+
[compute]
11+
min_compute_nodes = 2
12+
min_microversion = 2.1
13+
max_microversion = 2.88
14+
15+
[service-clients]
16+
http_timeout = 600
17+
18+
[compute-feature-enabled]
19+
resize = true
20+
live_migration = true
21+
block_migration_for_live_migration = false
22+
volume_backed_live_migration = true
23+
console_output = true
24+
25+
[volume]
26+
min_microversion = 3.0
27+
max_microversion = 3.66
28+
29+
[dashboard]
30+
dashboard_url = http://192.168.39.2
Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- name: Configure VXLAN
3-
hosts: storage,seed,controllers,compute
3+
hosts: controllers,compute,seed,storage
44
gather_facts: false
55
vars:
66
ansible_user: "{{ bootstrap_user }}"
@@ -11,10 +11,3 @@
1111
ansible_ssh_common_args: "-o StrictHostKeyChecking=no"
1212
roles:
1313
- role: stackhpc.vxlan
14-
vars:
15-
vxlan_phys_dev: "{{ admin_oc_net_name | net_interface }}"
16-
vxlan_dstport: 4790
17-
vxlan_interfaces:
18-
- device: vxlan10
19-
group: 224.0.0.10
20-
bridge: breth1
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
- name: Fix hostname on storage nodes for cephadm
3+
hosts: storage
4+
gather_facts: false
5+
vars:
6+
ansible_user: "{{ bootstrap_user }}"
7+
# We can't assume that a virtualenv exists at this point, so use the system
8+
# python interpreter.
9+
ansible_python_interpreter: /usr/bin/python3
10+
# Work around no known_hosts entry on first boot.
11+
ansible_ssh_common_args: "-o StrictHostKeyChecking=no"
12+
tasks:
13+
- name: Get current hostname
14+
ansible.builtin.command:
15+
cmd: hostname
16+
changed_when: false
17+
register: current_hostname
18+
19+
- name: Set hostname to a non FQDN
20+
ansible.builtin.command:
21+
cmd: hostnamectl set-hostname "{{ inventory_hostname }}"
22+
when: current_hostname.stdout != inventory_hostname
23+
become: true
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
- name: Fix networking
3+
hosts: seed,compute,controllers,storage
4+
gather_facts: false
5+
vars:
6+
ansible_user: "{{ bootstrap_user }}"
7+
# We can't assume that a virtualenv exists at this point, so use the system
8+
# python interpreter.
9+
ansible_python_interpreter: /usr/bin/python3
10+
# Work around no known_hosts entry on first boot.
11+
ansible_ssh_common_args: "-o StrictHostKeyChecking=no"
12+
tasks:
13+
- name: Ensure `hosts` file contains pulp entries
14+
ansible.builtin.copy:
15+
content: |
16+
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
17+
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
18+
10.0.0.34 pelican pelican.service.compute.sms-lab.cloud
19+
10.205.3.187 pulp-server pulp-server.internal.sms-cloud
20+
dest: /etc/hosts
21+
become: true

etc/kayobe/ansible/requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
collections:
33
- name: stackhpc.cephadm
4-
version: 1.10.0
4+
version: 1.12.2
55
- name: stackhpc.pulp
66
version: 0.4.1
77
roles:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2+
compute_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cloud-user' }}"
23
# List of storage volume groups. See mrlesmithjr.manage-lvm role for
34
# format.
45
compute_lvm_groups:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2+
controller_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cloud-user' }}"
23
# List of storage volume groups. See mrlesmithjr.manage-lvm role for
34
# format.
45
controller_lvm_groups:

0 commit comments

Comments
 (0)