Skip to content

Commit 25f0938

Browse files
vakwetuopenshift-merge-bot[bot]
authored andcommitted
Add support for multiple regions
Note: As a cleanup, changed the novacell compute config helper function (generateComputeConfigs() to explictly return nil after all errors are handled.
1 parent ee3d496 commit 25f0938

38 files changed

Lines changed: 359 additions & 40 deletions

api/bases/nova.openstack.org_novaapis.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,11 @@ spec:
277277
The key must be the endpoint type (public, internal)
278278
type: object
279279
type: object
280+
region:
281+
default: regionOne
282+
description: Region - the region name to use for service endpoint
283+
discovery
284+
type: string
280285
registeredCells:
281286
additionalProperties:
282287
type: string

api/bases/nova.openstack.org_novacells.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -967,6 +967,11 @@ spec:
967967
description: PreserveJobs - do not delete jobs after they finished
968968
e.g. to check logs
969969
type: boolean
970+
region:
971+
default: regionOne
972+
description: Region - the region name to use for service endpoint
973+
discovery
974+
type: string
970975
secret:
971976
description: |-
972977
Secret is the name of the Secret instance containing password

api/bases/nova.openstack.org_novacomputes.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@ spec:
9696
description: NodeSelector to target subset of worker nodes running
9797
this service
9898
type: object
99+
region:
100+
default: regionOne
101+
description: Region - the region name to use for service endpoint
102+
discovery
103+
type: string
99104
replicas:
100105
default: 1
101106
description: Replicas of the service to run

api/bases/nova.openstack.org_novaconductors.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@ spec:
138138
description: PreserveJobs - do not delete jobs after they finished
139139
e.g. to check logs
140140
type: boolean
141+
region:
142+
default: regionOne
143+
description: Region - the region name to use for service endpoint
144+
discovery
145+
type: string
141146
replicas:
142147
default: 1
143148
description: Replicas of the service to run

api/bases/nova.openstack.org_novametadata.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,11 @@ spec:
272272
type: object
273273
type: object
274274
type: object
275+
region:
276+
default: regionOne
277+
description: Region - the region name to use for service endpoint
278+
discovery
279+
type: string
275280
registeredCells:
276281
additionalProperties:
277282
type: string

api/bases/nova.openstack.org_novanovncproxies.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,11 @@ spec:
249249
type: object
250250
type: object
251251
type: object
252+
region:
253+
default: regionOne
254+
description: Region - the region name to use for service endpoint
255+
discovery
256+
type: string
252257
replicas:
253258
default: 1
254259
description: Replicas of the service to run

api/bases/nova.openstack.org_novaschedulers.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@ spec:
101101
description: NodeSelector to target subset of worker nodes running
102102
this service
103103
type: object
104+
region:
105+
default: regionOne
106+
description: Region - the region name to use for service endpoint
107+
discovery
108+
type: string
104109
registeredCells:
105110
additionalProperties:
106111
type: string

api/v1beta1/novaapi_types.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,11 @@ type NovaAPISpec struct {
123123
// to redirect unauthenticated users.
124124
KeystonePublicAuthURL string `json:"keystonePublicAuthURL"`
125125

126+
// +kubebuilder:validation:Optional
127+
// +kubebuilder:default=regionOne
128+
// Region - the region name to use for service endpoint discovery
129+
Region string `json:"region"`
130+
126131
// +kubebuilder:validation:Optional
127132
// +kubebuilder:default="nova-api"
128133
// APIDatabaseAccount - MariaDBAccount to use when accessing the API DB

api/v1beta1/novacell_types.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,11 @@ type NovaCellSpec struct {
141141
// to keystone
142142
KeystoneAuthURL string `json:"keystoneAuthURL"`
143143

144+
// +kubebuilder:validation:Optional
145+
// +kubebuilder:default=regionOne
146+
// Region - the region name to use for service endpoint discovery
147+
Region string `json:"region"`
148+
144149
// +kubebuilder:validation:Optional
145150
// +kubebuilder:default=nova
146151
// APIDatabaseAccount - MariaDBAccount to use when accessing the API DB

api/v1beta1/novacompute_types.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@ type NovaComputeSpec struct {
101101
// +kubebuilder:validation:Required
102102
KeystoneAuthURL string `json:"keystoneAuthURL"`
103103

104+
// +kubebuilder:validation:Optional
105+
// +kubebuilder:default=regionOne
106+
// Region - the region name to use for service endpoint discovery
107+
Region string `json:"region"`
108+
104109
// NovaServiceBase specifies the generic fields of the service
105110
NovaServiceBase `json:",inline"`
106111

@@ -222,6 +227,7 @@ func NewNovaComputeSpec(
222227
},
223228
KeystoneAuthURL: novaCell.KeystoneAuthURL,
224229
ServiceUser: novaCell.ServiceUser,
230+
Region: novaCell.Region,
225231
ServiceAccount: novaCell.ServiceAccount,
226232
ComputeDriver: computeTemplate.ComputeDriver,
227233
TLS: novaCell.TLS,

0 commit comments

Comments
 (0)