Skip to content

Commit

Permalink
Remove Jinja templates and update service-values.yaml
Browse files Browse the repository at this point in the history
- Removed Jinja templates, as they were moved to the `ci-framework`
- Updated the `service-values.yaml` with configuration changes
as requested
  • Loading branch information
sbekkerm committed Oct 14, 2024
1 parent 5571ef6 commit 4721147
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 454 deletions.
5 changes: 5 additions & 0 deletions automation/vars/dcn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,8 @@ vas:
- name: network-values
src_file: nncp/values.yaml
build_output: ../control-plane.yaml
post_stage_run:
- name: Deploy DCN
type: playbook
source: "../../playbooks/dcn/deploy-dcn.yml"
inventory: "${HOME}/ci-framework-data/artifacts/zuul_inventory.yml"

Check failure on line 30 in automation/vars/dcn.yaml

View workflow job for this annotation

GitHub Actions / yaml-lint

30:80 [new-line-at-end-of-file] no new line character at the end of file
1 change: 0 additions & 1 deletion examples/dt/dcn/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ This is a collection of CR templates that represent a Red Hat OpenStack Services
- Cinder Backup using RBD for backend
- Glance using Multi Store Support and RBD for backend
- Nova using RBD for ephemeral storage
- Manila using CephFS for backend

## Considerations

Expand Down
19 changes: 0 additions & 19 deletions examples/dt/dcn/deployment/values.yaml.j2

This file was deleted.

20 changes: 0 additions & 20 deletions examples/dt/dcn/edpm-pre-ceph/deployment/values.yaml.j2

This file was deleted.

163 changes: 0 additions & 163 deletions examples/dt/dcn/edpm-pre-ceph/nodeset/values.yaml.j2

This file was deleted.

26 changes: 1 addition & 25 deletions examples/dt/dcn/service-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,6 @@ data:
rbd_store_pool = images
rbd_store_user = openstack
rbd_thin_provisioning = True
[image_import_opts]
image_import_plugins = ['image_conversion']
[image_conversion]
output_format = raw
networkAttachments:
- storage
override:
Expand Down Expand Up @@ -140,16 +136,6 @@ data:
rbd_store_pool = images
rbd_store_user = openstack
rbd_thin_provisioning = True
[az2]
rbd_store_ceph_conf = /etc/ceph/az2.conf
store_description = "az2 RBD backend"
rbd_store_pool = images
rbd_store_user = openstack
rbd_thin_provisioning = True
[image_import_opts]
image_import_plugins = ['image_conversion']
[image_conversion]
output_format = raw
networkAttachments:
- storage
override:
Expand Down Expand Up @@ -183,16 +169,6 @@ data:
rbd_store_pool = images
rbd_store_user = openstack
rbd_thin_provisioning = True
[az1]
rbd_store_ceph_conf = /etc/ceph/az1.conf
store_description = "az1 RBD backend"
rbd_store_pool = images
rbd_store_user = openstack
rbd_thin_provisioning = True
[image_import_opts]
image_import_plugins = ['image_conversion']
[image_conversion]
output_format = raw
networkAttachments:
- storage
override:
Expand All @@ -208,7 +184,7 @@ data:
replicas: 3
type: edge
manila:
enabled: true
enabled: false
manilaAPI:
customServiceConfig: |
[DEFAULT]
Expand Down
Loading

0 comments on commit 4721147

Please sign in to comment.