Skip to content

Commit

Permalink
Introduce "OSP" infra snippet in the automation file
Browse files Browse the repository at this point in the history
For adoption, there's a need to override the infra exposed by the
scenario.
While this new "adoption" entry creates a stronger link with the
ci-framework, it can also be consumed by any other tool, as long as it
knows how to consume the two "patches".

This is part of a PoC, and will probably lead to discussions regarding
the best way to manage all of the datasets.
  • Loading branch information
cjeanner committed Sep 2, 2024
1 parent 8cb4e08 commit ae6968d
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 299 deletions.
299 changes: 0 additions & 299 deletions automation/vars/default.yaml

This file was deleted.

75 changes: 75 additions & 0 deletions automation/vars/hci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,78 @@ vas:
- name: edpm-deployment-values-post-ceph
src_file: values.yaml
build_output: deployment-post-ceph.yaml

# Adoption related content for adoption
adoption:
hci:
layout_patch:
vms:
# Let's remove the default computes, since we want to adopt the
# OSP ones
compute:
amount: 0
osp-undercloud:
amount: 1
disk_file_name: rhel-8.10.qcow2
image_local_dir: "{{ cifmw_basedir }}/images/"
image_url: "{{ cifmw_discovered_image_url }}"
sha256_image_name: "{{ cifmw_discovered_hash }}"
memory: 16
cpus: 8
disksize: 80
nets:
- ocpbm
- osp_trunk
osp-controller:
amount: 3
disk_file_name: rhel-8.10.qcow2
image_local_dir: "{{ cifmw_basedir }}/images/"
image_url: "{{ cifmw_discovered_image_url }}"
sha256_image_name: "{{ cifmw_discovered_hash }}"
memory: 16
cpus: 8
disksize: 80
nets:
- ocpbm
- osp_trunk
osp-compute:
amount: 3
disk_file_name: rhel-8.10.qcow2
image_local_dir: "{{ cifmw_basedir }}/images/"
image_url: "{{ cifmw_discovered_image_url }}"
sha256_image_name: "{{ cifmw_discovered_hash }}"
memory: 4
cpus: 4
disksize: 20
nets:
- ocpbm
- osp_trunk
networking_mapper_patch:
group-templates:
osp-controllers:
network-template:
range:
start: 200
length: 3
networks: &osp_nets
ctlplane: {}
internalapi:
trunk-parent: ctlplane
tenant:
trunk-parent: ctlplane
storage:
trunk-parent: ctlplane
storagemgmt:
trunk-parent: ctlplane
osp-computes:
network-template:
range:
start: 210
length: 3
networks: *osp_nets
osp-underclouds:
network-template:
range:
start: 199
length: 1
networks: *osp_nets

0 comments on commit ae6968d

Please sign in to comment.