Skip to content

Commit ee07cd3

Browse files
authored
Merge pull request #1021 from stackhpc/yoga-multinode-ci-aio-user
yoga: Support running multinode clusters on Leafcloud
2 parents 9179111 + 5037816 commit ee07cd3

File tree

7 files changed

+34
-14
lines changed

7 files changed

+34
-14
lines changed

doc/source/configuration/vault.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Setup HAProxy config for Vault
111111

112112
.. code-block::
113113
114-
kayobe overcloud service deploy -kt haproxy
114+
kayobe overcloud service deploy --skip-tags os_capacity -kt haproxy
115115
116116
Setup Vault HA on the overcloud hosts
117117
-------------------------------------

etc/kayobe/ansible/deploy-os-capacity-exporter.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
- name: Remove legacy os_exporter.cfg file
33
hosts: network
4+
tags: os_capacity
45
gather_facts: false
56
tasks:
67
- name: Ensure legacy os_exporter.cfg config file is deleted
@@ -11,6 +12,7 @@
1112

1213
- name: Deploy os-capacity exporter
1314
hosts: monitoring
15+
tags: os_capacity
1416
gather_facts: false
1517
tasks:
1618
- name: Create os-capacity directory

etc/kayobe/ansible/fix-networking.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,16 @@
1010
# Work around no known_hosts entry on first boot.
1111
ansible_ssh_common_args: "-o StrictHostKeyChecking=no"
1212
tasks:
13-
- name: Ensure `hosts` file contains pulp entries
13+
- name: Ensure hosts are reachable
14+
ansible.builtin.wait_for_connection:
15+
16+
- name: Ensure `hosts` file contains pulp and API entries
1417
blockinfile:
1518
path: /etc/hosts
16-
marker: "# {mark} Kayobe Pulp entries"
19+
marker: "# {mark} Kayobe entries"
1720
block: |
1821
10.0.0.34 pelican pelican.service.compute.sms-lab.cloud
1922
10.205.3.187 pulp-server pulp-server.internal.sms-cloud
23+
192.168.37.2 internal.infra.mos.{{ root_domain }}
24+
192.168.39.2 public.infra.mos.{{ root_domain }}
2025
become: true

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
###############################################################################
33
# Cephadm deployment configuration.
44

5+
# Ceph release name.
6+
cephadm_ceph_release: "{{ 'quincy' if (ansible_facts['distribution_release'] == 'jammy' or ansible_facts.distribution_major_version == '9') else 'pacific' }}"
7+
8+
# Ceph container image tag.
9+
cephadm_image_tag: "{{ 'v17.2.7' if cephadm_ceph_release == 'quincy' else 'v16.2.14' }}"
10+
511
# Ceph OSD specification.
612
cephadm_osd_spec:
713
service_type: osd

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ stackhpc_barbican_role_id_file_path: "/tmp/barbican-role-id"
6464
###############################################################################
6565

6666
# Avoid a reboot.
67-
disable_selinux_do_reboot: false
67+
disable_selinux_do_reboot: true
6868

6969
###############################################################################
7070
# Dummy variable to allow Ansible to accept this file.

etc/kayobe/environments/ci-multinode/kolla/globals.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
---
2+
# Most development environments will use nested virtualisation, and we can't
3+
# guarantee that nested KVM support is available. Use QEMU as a lowest common
4+
# denominator.
5+
nova_compute_virt_type: qemu
6+
27
# Reduce the control plane's memory footprint by limiting the number of worker
38
# processes to two per-service when running in a VM.
49
openstack_service_workers: "{% raw %}{{ [ansible_facts.processor_vcpus, 2 if ansible_facts.virtualization_role == 'guest' else 5] | min }}{% endraw %}"

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,16 @@ kolla_docker_namespace: stackhpc-dev
1010

1111
# Host and port of a package repository mirror.
1212
# Build and deploy the development Pulp service repositories.
13-
stackhpc_repo_mirror_url: "http://pulp-server.internal.sms-cloud:8080"
13+
# Use Ark's package repositories to install packages.
14+
stackhpc_repo_mirror_url: "{{ stackhpc_release_pulp_url }}"
15+
stackhpc_repo_mirror_username: "skc-ci-aio"
16+
stackhpc_repo_mirror_password: !vault |
17+
$ANSIBLE_VAULT;1.1;AES256
18+
36373536303261313239613761653261663437356566343865383563346334396136653666383765
19+
6634396534653865633936653038383132396532386665370a366562383166353966663838316266
20+
65333133636330623936623438666632316238376264313234346333346461623765633163353635
21+
6565326136313564320a303231383438333062643533333335663034613439393665656162626137
22+
65356232656164663831316530333136336362393636656566353635306565626636
1423
1524
# Build and deploy released Pulp repository versions.
1625
stackhpc_repo_centos_stream_baseos_version: "{{ stackhpc_pulp_repo_centos_stream_8_baseos_version }}"
@@ -66,12 +75,5 @@ stackhpc_include_os_minor_version_in_repo_url: true
6675
# Push built images to the development Pulp service registry.
6776
stackhpc_docker_registry: "{{ stackhpc_repo_mirror_url | regex_replace('^https?://', '') }}"
6877

69-
# Username and password of container registry.
70-
stackhpc_docker_registry_username: "stackhpc-kayobe-ci"
71-
stackhpc_docker_registry_password: !vault |
72-
$ANSIBLE_VAULT;1.1;AES256
73-
33356166343730633865363431306535613736663764373034396132356131343066636530393534
74-
3262646436663034633131316438633230383330633533350a386365313239303464383636376338
75-
61656662333939333063343131633963636431663136643137636664633233633133396339613861
76-
3038613063626138610a333566393937643630366564653163613364323965396130613433316537
77-
39653335393831633362343934363866346262613166393561666336623062393935
78+
stackhpc_docker_registry_username: "{{ stackhpc_repo_mirror_username }}"
79+
stackhpc_docker_registry_password: "{{ stackhpc_repo_mirror_password }}"

0 commit comments

Comments
 (0)