Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge pull request Enable Octavia in uni01alpha and uni07eta jobs #397

Merged
merged 2 commits into from
Sep 16, 2024
Merged

Merge pull request Enable Octavia in uni01alpha and uni07eta jobs #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bc41b1
Merge pull request #335 from beagles/dnm-enable-octavia
softwarefactory-project-zuul[bot] Sep 12, 2024
c66038e
Merge pull request #367 from lavraham/uni07eta_octavia
softwarefactory-project-zuul[bot] Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions dt/uni07eta/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,54 @@ replacements:
options:
create: true

- source:
kind: ConfigMap
name: service-values
fieldPath: data.octavia.octaviaAPI.customServiceConfig
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.octavia.template.octaviaAPI.customServiceConfig
options:
create: true

- source:
kind: ConfigMap
name: service-values
fieldPath: data.octavia.octaviaHealthManager.customServiceConfig
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.octavia.template.octaviaHealthManager.customServiceConfig
options:
create: true

- source:
kind: ConfigMap
name: service-values
fieldPath: data.octavia.octaviaHousekeeping.customServiceConfig
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.octavia.template.octaviaHousekeeping.customServiceConfig
options:
create: true

- source:
kind: ConfigMap
name: service-values
fieldPath: data.octavia.octaviaWorker.customServiceConfig
targets:
- select:
kind: OpenStackControlPlane
fieldPaths:
- spec.octavia.template.octaviaWorker.customServiceConfig
options:
create: true

# OVN

- source:
Expand Down
2 changes: 1 addition & 1 deletion examples/dt/uni01alpha/control-plane/service-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ data:
enabled: true

octavia:
enabled: false
enabled: true
amphoraImageContainerImage: quay.io/gthiemonge/octavia-amphora-image
apacheContainerImage: registry.redhat.io/ubi9/httpd-24:latest
availabilityZones:
Expand Down
8 changes: 7 additions & 1 deletion examples/dt/uni07eta/control-plane/nncp/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,13 @@ data:
"type": "whereabouts",
"range": "172.23.0.0/24",
"range_start": "172.23.0.30",
"range_end": "172.23.0.70"
"range_end": "172.23.0.70",
"routes": [
{
"dst": "172.24.0.0/16",
"gw": "172.23.0.150"
}
]
}
}

Expand Down
20 changes: 18 additions & 2 deletions examples/dt/uni07eta/control-plane/service-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,37 @@ data:


octavia:
enabled: false
amphoraImageContainerImage: quay.io/gthiemonge/octavia-amphora-image
enabled: true
# Workaround for https://issues.redhat.com/browse/OSPRH-9102
# There's a bug in uni-epsilon, the octavia-operator uploads a qcow2 image
# to glance but a pre-tests task updates the properties of a cinder volume.
# This update fails because the default volume type is already in use.
amphoraImageContainerImage: ""
apacheContainerImage: registry.redhat.io/ubi9/httpd-24:latest
octaviaAPI:
networkAttachments:
- internalapi
customServiceConfig: |
[controller_worker]
loadbalancer_topology=ACTIVE_STANDBY
octaviaHousekeeping:
networkAttachments:
- octavia
customServiceConfig: |
[controller_worker]
loadbalancer_topology=ACTIVE_STANDBY
octaviaHealthManager:
networkAttachments:
- octavia
customServiceConfig: |
[controller_worker]
loadbalancer_topology=ACTIVE_STANDBY
octaviaWorker:
networkAttachments:
- octavia
customServiceConfig: |
[controller_worker]
loadbalancer_topology=ACTIVE_STANDBY

ovn:
ovnController:
Expand Down