Skip to content

Commit 88ad58e

Browse files
authored
Merge branch 'openstack-k8s-operators:main' into enable_TaaS
2 parents 6abb906 + d357cef commit 88ad58e

File tree

82 files changed

+450
-71
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+450
-71
lines changed

dt/uni05epsilon/edpm-post-ceph/nodeset/kustomization.yaml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ transformers:
1818
1919
components:
2020
- ../../../../lib/control-plane
21+
- ../../../../lib/control-plane/messaging-bus
2122
- ../../../../lib/dataplane/nodeset
2223

2324
patches:
@@ -389,17 +390,6 @@ replacements:
389390
#
390391
# Notifications
391392
#
392-
- source:
393-
kind: ConfigMap
394-
name: service-values
395-
fieldPath: data.notificationsBusInstance
396-
targets:
397-
- select:
398-
kind: OpenStackControlPlane
399-
fieldPaths:
400-
- spec.notificationsBusInstance
401-
options:
402-
create: true
403393
- source:
404394
kind: ConfigMap
405395
name: service-values

examples/dt/bgp-l3-xl/control-plane/service-values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ metadata:
88
data:
99
# --- Fields required by lib/control-plane ---
1010
preserveJobs: false
11+
notificationsBus:
12+
cluster: rabbitmq
1113
tls:
1214
caBundleSecretName: ""
1315

examples/dt/bgp-l3-xl/edpm/computes/r0/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@ data:
176176
services:
177177
- bootstrap
178178
- download-cache
179-
- configure-network
180179
- install-os
181180
- configure-os
181+
- configure-network
182182
- frr
183183
- validate-network
184184
- run-os

examples/dt/bgp-l3-xl/edpm/computes/r1/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@ data:
176176
services:
177177
- bootstrap
178178
- download-cache
179-
- configure-network
180179
- install-os
181180
- configure-os
181+
- configure-network
182182
- frr
183183
- validate-network
184184
- run-os

examples/dt/bgp-l3-xl/edpm/computes/r2/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@ data:
176176
services:
177177
- bootstrap
178178
- download-cache
179-
- configure-network
180179
- install-os
181180
- configure-os
181+
- configure-network
182182
- frr
183183
- validate-network
184184
- run-os

examples/dt/bgp-l3-xl/edpm/networkers/r0/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ data:
145145
services:
146146
- bootstrap
147147
- download-cache
148-
- configure-network
149148
- install-os
150149
- configure-os
150+
- configure-network
151151
- frr
152152
- validate-network
153153
- ssh-known-hosts

examples/dt/bgp-l3-xl/edpm/networkers/r1/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ data:
145145
services:
146146
- bootstrap
147147
- download-cache
148-
- configure-network
149148
- install-os
150149
- configure-os
150+
- configure-network
151151
- frr
152152
- validate-network
153153
- ssh-known-hosts

examples/dt/bgp-l3-xl/edpm/networkers/r2/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ data:
145145
services:
146146
- bootstrap
147147
- download-cache
148-
- configure-network
149148
- install-os
150149
- configure-os
150+
- configure-network
151151
- frr
152152
- validate-network
153153
- ssh-known-hosts

examples/dt/bgp_dt01/control-plane/kustomization.yaml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,3 +145,64 @@ replacements:
145145
- spec.octavia.template.nodeSelector
146146
options:
147147
create: true
148+
149+
# configure designate
150+
- source:
151+
kind: ConfigMap
152+
name: service-values
153+
fieldPath: data.designate-redis.replicas
154+
targets:
155+
- select:
156+
kind: OpenStackControlPlane
157+
fieldPaths:
158+
- spec.redis.templates.designate-redis.replicas
159+
options:
160+
create: true
161+
162+
- source:
163+
kind: ConfigMap
164+
name: service-values
165+
fieldPath: data.designate-redis.enabled
166+
targets:
167+
- select:
168+
kind: OpenStackControlPlane
169+
fieldPaths:
170+
- spec.redis.enabled
171+
options:
172+
create: true
173+
174+
- source:
175+
kind: ConfigMap
176+
name: service-values
177+
fieldPath: data.designate.enabled
178+
targets:
179+
- select:
180+
kind: OpenStackControlPlane
181+
fieldPaths:
182+
- spec.designate.enabled
183+
options:
184+
create: true
185+
186+
- source:
187+
kind: ConfigMap
188+
name: service-values
189+
fieldPath: data.designate.bind9Services
190+
targets:
191+
- select:
192+
kind: OpenStackControlPlane
193+
fieldPaths:
194+
- spec.designate.template.designateBackendbind9.override
195+
options:
196+
create: true
197+
198+
- source:
199+
kind: ConfigMap
200+
name: service-values
201+
fieldPath: data.designate.nsRecords
202+
targets:
203+
- select:
204+
kind: OpenStackControlPlane
205+
fieldPaths:
206+
- spec.designate.template.nsRecords
207+
options:
208+
create: true
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
apiVersion: metallb.io/v1beta1
3+
kind: IPAddressPool
4+
metadata:
5+
namespace: metallb-system
6+
name: designateext
7+
labels:
8+
osp/lb-addresses-type: standard
9+
spec:
10+
addresses:
11+
- __replaced__

0 commit comments

Comments
 (0)