diff --git a/api/bases/nova.openstack.org_nova.yaml b/api/bases/nova.openstack.org_nova.yaml index 322c6ee19..f06baca75 100644 --- a/api/bases/nova.openstack.org_nova.yaml +++ b/api/bases/nova.openstack.org_nova.yaml @@ -90,6 +90,19 @@ spec: NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the + service (e.g. api, scheduler, conductor). + type: string + type: object override: description: Override, provides the ability to override the generated manifest of several child resources. @@ -427,6 +440,19 @@ spec: NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical + OpenStack service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack + service name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within + the service (e.g. api, scheduler, conductor). + type: string + type: object replicas: default: 1 description: Replicas of the service to run @@ -614,6 +640,19 @@ spec: NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical + OpenStack service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack + service name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within + the service (e.g. api, scheduler, conductor). + type: string + type: object override: description: Override, provides the ability to override the generated manifest of several child resources. @@ -903,6 +942,19 @@ spec: description: NodeSelector to target subset of worker nodes running this service type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical + OpenStack service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack + service name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within + the service (e.g. api, scheduler, conductor). + type: string + type: object override: description: Override, provides the ability to override the generated manifest of several child resources. @@ -1217,6 +1269,19 @@ spec: NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical + OpenStack service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack + service name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within + the service (e.g. api, scheduler, conductor). + type: string + type: object replicas: default: 1 description: Replicas of the service to run. For ironic.IronicDriver @@ -1313,6 +1378,19 @@ spec: compute_name: compute_template. Key from map is arbitrary name for the compute with a limit of 20 characters. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the + service (e.g. api, scheduler, conductor). + type: string + type: object topologyRef: description: |- TopologyRef to apply the Topology defined by the associated CR referenced @@ -1434,6 +1512,19 @@ spec: NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the + service (e.g. api, scheduler, conductor). + type: string + type: object override: description: Override, provides the ability to override the generated manifest of several child resources. @@ -1783,6 +1874,19 @@ spec: NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the + service (e.g. api, scheduler, conductor). + type: string + type: object replicas: default: 1 description: Replicas of the service to run diff --git a/api/bases/nova.openstack.org_novaapis.yaml b/api/bases/nova.openstack.org_novaapis.yaml index da1464453..7b96dfc93 100644 --- a/api/bases/nova.openstack.org_novaapis.yaml +++ b/api/bases/nova.openstack.org_novaapis.yaml @@ -118,6 +118,19 @@ spec: description: NodeSelector to target subset of worker nodes running this service type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the service + (e.g. api, scheduler, conductor). + type: string + type: object override: description: Override, provides the ability to override the generated manifest of several child resources. diff --git a/api/bases/nova.openstack.org_novacells.yaml b/api/bases/nova.openstack.org_novacells.yaml index 45a27f8b4..13c4b7590 100644 --- a/api/bases/nova.openstack.org_novacells.yaml +++ b/api/bases/nova.openstack.org_novacells.yaml @@ -100,6 +100,19 @@ spec: NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the + service (e.g. api, scheduler, conductor). + type: string + type: object replicas: default: 1 description: Replicas of the service to run @@ -266,6 +279,19 @@ spec: NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the + service (e.g. api, scheduler, conductor). + type: string + type: object override: description: Override, provides the ability to override the generated manifest of several child resources. @@ -551,6 +577,19 @@ spec: description: NodeSelector to target subset of worker nodes running this service type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the + service (e.g. api, scheduler, conductor). + type: string + type: object override: description: Override, provides the ability to override the generated manifest of several child resources. @@ -864,6 +903,19 @@ spec: NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the + service (e.g. api, scheduler, conductor). + type: string + type: object replicas: default: 1 description: Replicas of the service to run. For ironic.IronicDriver diff --git a/api/bases/nova.openstack.org_novacomputes.yaml b/api/bases/nova.openstack.org_novacomputes.yaml index cf4cebcf4..2174664ba 100644 --- a/api/bases/nova.openstack.org_novacomputes.yaml +++ b/api/bases/nova.openstack.org_novacomputes.yaml @@ -96,6 +96,19 @@ spec: description: NodeSelector to target subset of worker nodes running this service type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the service + (e.g. api, scheduler, conductor). + type: string + type: object region: default: regionOne description: Region - the region name to use for service endpoint diff --git a/api/bases/nova.openstack.org_novaconductors.yaml b/api/bases/nova.openstack.org_novaconductors.yaml index bf1311254..5fa019c45 100644 --- a/api/bases/nova.openstack.org_novaconductors.yaml +++ b/api/bases/nova.openstack.org_novaconductors.yaml @@ -133,6 +133,19 @@ spec: description: NodeSelector to target subset of worker nodes running this service type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the service + (e.g. api, scheduler, conductor). + type: string + type: object preserveJobs: default: false description: PreserveJobs - do not delete jobs after they finished diff --git a/api/bases/nova.openstack.org_novametadata.yaml b/api/bases/nova.openstack.org_novametadata.yaml index e113ff0c0..49c17f041 100644 --- a/api/bases/nova.openstack.org_novametadata.yaml +++ b/api/bases/nova.openstack.org_novametadata.yaml @@ -120,6 +120,19 @@ spec: description: NodeSelector to target subset of worker nodes running this service type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the service + (e.g. api, scheduler, conductor). + type: string + type: object override: description: Override, provides the ability to override the generated manifest of several child resources. diff --git a/api/bases/nova.openstack.org_novanovncproxies.yaml b/api/bases/nova.openstack.org_novanovncproxies.yaml index 77b96fd57..cce58962c 100644 --- a/api/bases/nova.openstack.org_novanovncproxies.yaml +++ b/api/bases/nova.openstack.org_novanovncproxies.yaml @@ -96,6 +96,19 @@ spec: description: NodeSelector to target subset of worker nodes running this service type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the service + (e.g. api, scheduler, conductor). + type: string + type: object override: description: Override, provides the ability to override the generated manifest of several child resources. diff --git a/api/bases/nova.openstack.org_novaschedulers.yaml b/api/bases/nova.openstack.org_novaschedulers.yaml index 3bb5934cb..5f11981fe 100644 --- a/api/bases/nova.openstack.org_novaschedulers.yaml +++ b/api/bases/nova.openstack.org_novaschedulers.yaml @@ -101,6 +101,19 @@ spec: description: NodeSelector to target subset of worker nodes running this service type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the service + (e.g. api, scheduler, conductor). + type: string + type: object region: default: regionOne description: Region - the region name to use for service endpoint diff --git a/api/nova/v1beta1/common_types.go b/api/nova/v1beta1/common_types.go index a41792196..0b72d1f38 100644 --- a/api/nova/v1beta1/common_types.go +++ b/api/nova/v1beta1/common_types.go @@ -43,6 +43,16 @@ const ( ComputeDiscoverHashKey = "nova-compute-discovery" ) +// OpenStackServiceIdentity names the logical OpenStack service and component for this CR instance. +type OpenStackServiceIdentity struct { + // +kubebuilder:validation:Optional + // OpenstackService is the logical OpenStack service name (e.g. nova). + OpenstackService string `json:"openstackService,omitempty"` + // +kubebuilder:validation:Optional + // ServiceComponent is the component within the service (e.g. api, scheduler, conductor). + ServiceComponent string `json:"serviceComponent,omitempty"` +} + // NovaServiceBase contains the fields that are needed for each nova service CRD type NovaServiceBase struct { // +kubebuilder:validation:Optional @@ -79,6 +89,9 @@ type NovaServiceBase struct { // TopologyRef to apply the Topology defined by the associated CR referenced // by name TopologyRef *topologyv1.TopoRef `json:"topologyRef,omitempty"` + + // +kubebuilder:validation:Optional + OpenStackServiceIdentity `json:"openStackServiceIdentity,omitempty"` } // PasswordSelector to identify the DB and AdminUser password from the Secret diff --git a/api/nova/v1beta1/novaapi_types.go b/api/nova/v1beta1/novaapi_types.go index dfa416fac..48a950916 100644 --- a/api/nova/v1beta1/novaapi_types.go +++ b/api/nova/v1beta1/novaapi_types.go @@ -79,6 +79,9 @@ type NovaAPITemplate struct { // TopologyRef to apply the Topology defined by the associated CR referenced // by name TopologyRef *topologyv1.TopoRef `json:"topologyRef,omitempty"` + + // +kubebuilder:validation:Optional + OpenStackServiceIdentity `json:"openStackServiceIdentity,omitempty"` } // APIOverrideSpec to override the generated manifest of several child resources. diff --git a/api/nova/v1beta1/novacell_types.go b/api/nova/v1beta1/novacell_types.go index 7b35e9ddf..f75e0f66f 100644 --- a/api/nova/v1beta1/novacell_types.go +++ b/api/nova/v1beta1/novacell_types.go @@ -104,6 +104,9 @@ type NovaCellTemplate struct { // +kubebuilder:validation:Optional // DBPurge defines the parameters for the DB archiving and purging cron job DBPurge NovaCellDBPurge `json:"dbPurge"` + + // +kubebuilder:validation:Optional + OpenStackServiceIdentity `json:"openStackServiceIdentity,omitempty"` } // NovaCellSpec defines the desired state of NovaCell diff --git a/api/nova/v1beta1/novacompute_types.go b/api/nova/v1beta1/novacompute_types.go index 38e725ae7..f3fe75480 100644 --- a/api/nova/v1beta1/novacompute_types.go +++ b/api/nova/v1beta1/novacompute_types.go @@ -66,6 +66,9 @@ type NovaComputeTemplate struct { // NetworkAttachments is a list of NetworkAttachment resource names to expose the services to the given network NetworkAttachments []string `json:"networkAttachments,omitempty"` + // +kubebuilder:validation:Optional + OpenStackServiceIdentity `json:"openStackServiceIdentity,omitempty"` + // +kubebuilder:validation:Required // +kubebuilder:validation:Enum=ironic.IronicDriver;fake.FakeDriver // ComputeDriver - defines which driver to use for controlling virtualization diff --git a/api/nova/v1beta1/novaconductor_types.go b/api/nova/v1beta1/novaconductor_types.go index bcdda55fd..77417efcf 100644 --- a/api/nova/v1beta1/novaconductor_types.go +++ b/api/nova/v1beta1/novaconductor_types.go @@ -61,6 +61,9 @@ type NovaConductorTemplate struct { // TopologyRef to apply the Topology defined by the associated CR referenced // by name TopologyRef *topologyv1.TopoRef `json:"topologyRef,omitempty"` + + // +kubebuilder:validation:Optional + OpenStackServiceIdentity `json:"openStackServiceIdentity,omitempty"` } // NovaConductorSpec defines the desired state of NovaConductor diff --git a/api/nova/v1beta1/novametadata_types.go b/api/nova/v1beta1/novametadata_types.go index a39595201..bbaa390dc 100644 --- a/api/nova/v1beta1/novametadata_types.go +++ b/api/nova/v1beta1/novametadata_types.go @@ -90,6 +90,9 @@ type NovaMetadataTemplate struct { // TopologyRef to apply the Topology defined by the associated CR referenced // by name TopologyRef *topologyv1.TopoRef `json:"topologyRef,omitempty"` + + // +kubebuilder:validation:Optional + OpenStackServiceIdentity `json:"openStackServiceIdentity,omitempty"` } // MetadataOverrideSpec to override the generated manifest of several child resources. diff --git a/api/nova/v1beta1/novanovncproxy_types.go b/api/nova/v1beta1/novanovncproxy_types.go index 33b7f2566..762ebfb4d 100644 --- a/api/nova/v1beta1/novanovncproxy_types.go +++ b/api/nova/v1beta1/novanovncproxy_types.go @@ -82,6 +82,9 @@ type NovaNoVNCProxyTemplate struct { // TopologyRef to apply the Topology defined by the associated CR referenced // by name TopologyRef *topologyv1.TopoRef `json:"topologyRef,omitempty"` + + // +kubebuilder:validation:Optional + OpenStackServiceIdentity `json:"openStackServiceIdentity,omitempty"` } // TLSSection defines the desired state of TLS configuration diff --git a/api/nova/v1beta1/novascheduler_types.go b/api/nova/v1beta1/novascheduler_types.go index 75d79d5f3..7a8c3e75a 100644 --- a/api/nova/v1beta1/novascheduler_types.go +++ b/api/nova/v1beta1/novascheduler_types.go @@ -61,6 +61,9 @@ type NovaSchedulerTemplate struct { // TopologyRef to apply the Topology defined by the associated CR referenced // by name TopologyRef *topologyv1.TopoRef `json:"topologyRef,omitempty"` + + // +kubebuilder:validation:Optional + OpenStackServiceIdentity `json:"openStackServiceIdentity,omitempty"` } // NovaSchedulerSpec defines the desired state of NovaScheduler diff --git a/api/nova/v1beta1/zz_generated.deepcopy.go b/api/nova/v1beta1/zz_generated.deepcopy.go index 0da528695..1859841e2 100644 --- a/api/nova/v1beta1/zz_generated.deepcopy.go +++ b/api/nova/v1beta1/zz_generated.deepcopy.go @@ -307,6 +307,7 @@ func (in *NovaAPITemplate) DeepCopyInto(out *NovaAPITemplate) { *out = new(topologyv1beta1.TopoRef) **out = **in } + out.OpenStackServiceIdentity = in.OpenStackServiceIdentity } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NovaAPITemplate. @@ -549,6 +550,7 @@ func (in *NovaCellTemplate) DeepCopyInto(out *NovaCellTemplate) { } } in.DBPurge.DeepCopyInto(&out.DBPurge) + out.OpenStackServiceIdentity = in.OpenStackServiceIdentity } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NovaCellTemplate. @@ -761,6 +763,7 @@ func (in *NovaComputeTemplate) DeepCopyInto(out *NovaComputeTemplate) { *out = make([]string, len(*in)) copy(*out, *in) } + out.OpenStackServiceIdentity = in.OpenStackServiceIdentity } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NovaComputeTemplate. @@ -945,6 +948,7 @@ func (in *NovaConductorTemplate) DeepCopyInto(out *NovaConductorTemplate) { *out = new(topologyv1beta1.TopoRef) **out = **in } + out.OpenStackServiceIdentity = in.OpenStackServiceIdentity } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NovaConductorTemplate. @@ -1221,6 +1225,7 @@ func (in *NovaMetadataTemplate) DeepCopyInto(out *NovaMetadataTemplate) { *out = new(topologyv1beta1.TopoRef) **out = **in } + out.OpenStackServiceIdentity = in.OpenStackServiceIdentity } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NovaMetadataTemplate. @@ -1412,6 +1417,7 @@ func (in *NovaNoVNCProxyTemplate) DeepCopyInto(out *NovaNoVNCProxyTemplate) { *out = new(topologyv1beta1.TopoRef) **out = **in } + out.OpenStackServiceIdentity = in.OpenStackServiceIdentity } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NovaNoVNCProxyTemplate. @@ -1602,6 +1608,7 @@ func (in *NovaSchedulerTemplate) DeepCopyInto(out *NovaSchedulerTemplate) { *out = new(topologyv1beta1.TopoRef) **out = **in } + out.OpenStackServiceIdentity = in.OpenStackServiceIdentity } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NovaSchedulerTemplate. @@ -1644,6 +1651,7 @@ func (in *NovaServiceBase) DeepCopyInto(out *NovaServiceBase) { *out = new(topologyv1beta1.TopoRef) **out = **in } + out.OpenStackServiceIdentity = in.OpenStackServiceIdentity } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NovaServiceBase. @@ -1763,6 +1771,21 @@ func (in *NovaStatus) DeepCopy() *NovaStatus { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *OpenStackServiceIdentity) DeepCopyInto(out *OpenStackServiceIdentity) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OpenStackServiceIdentity. +func (in *OpenStackServiceIdentity) DeepCopy() *OpenStackServiceIdentity { + if in == nil { + return nil + } + out := new(OpenStackServiceIdentity) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *PasswordSelector) DeepCopyInto(out *PasswordSelector) { *out = *in diff --git a/config/crd/bases/nova.openstack.org_nova.yaml b/config/crd/bases/nova.openstack.org_nova.yaml index 322c6ee19..f06baca75 100644 --- a/config/crd/bases/nova.openstack.org_nova.yaml +++ b/config/crd/bases/nova.openstack.org_nova.yaml @@ -90,6 +90,19 @@ spec: NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the + service (e.g. api, scheduler, conductor). + type: string + type: object override: description: Override, provides the ability to override the generated manifest of several child resources. @@ -427,6 +440,19 @@ spec: NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical + OpenStack service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack + service name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within + the service (e.g. api, scheduler, conductor). + type: string + type: object replicas: default: 1 description: Replicas of the service to run @@ -614,6 +640,19 @@ spec: NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical + OpenStack service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack + service name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within + the service (e.g. api, scheduler, conductor). + type: string + type: object override: description: Override, provides the ability to override the generated manifest of several child resources. @@ -903,6 +942,19 @@ spec: description: NodeSelector to target subset of worker nodes running this service type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical + OpenStack service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack + service name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within + the service (e.g. api, scheduler, conductor). + type: string + type: object override: description: Override, provides the ability to override the generated manifest of several child resources. @@ -1217,6 +1269,19 @@ spec: NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical + OpenStack service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack + service name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within + the service (e.g. api, scheduler, conductor). + type: string + type: object replicas: default: 1 description: Replicas of the service to run. For ironic.IronicDriver @@ -1313,6 +1378,19 @@ spec: compute_name: compute_template. Key from map is arbitrary name for the compute with a limit of 20 characters. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the + service (e.g. api, scheduler, conductor). + type: string + type: object topologyRef: description: |- TopologyRef to apply the Topology defined by the associated CR referenced @@ -1434,6 +1512,19 @@ spec: NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the + service (e.g. api, scheduler, conductor). + type: string + type: object override: description: Override, provides the ability to override the generated manifest of several child resources. @@ -1783,6 +1874,19 @@ spec: NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the + service (e.g. api, scheduler, conductor). + type: string + type: object replicas: default: 1 description: Replicas of the service to run diff --git a/config/crd/bases/nova.openstack.org_novaapis.yaml b/config/crd/bases/nova.openstack.org_novaapis.yaml index da1464453..7b96dfc93 100644 --- a/config/crd/bases/nova.openstack.org_novaapis.yaml +++ b/config/crd/bases/nova.openstack.org_novaapis.yaml @@ -118,6 +118,19 @@ spec: description: NodeSelector to target subset of worker nodes running this service type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the service + (e.g. api, scheduler, conductor). + type: string + type: object override: description: Override, provides the ability to override the generated manifest of several child resources. diff --git a/config/crd/bases/nova.openstack.org_novacells.yaml b/config/crd/bases/nova.openstack.org_novacells.yaml index 45a27f8b4..13c4b7590 100644 --- a/config/crd/bases/nova.openstack.org_novacells.yaml +++ b/config/crd/bases/nova.openstack.org_novacells.yaml @@ -100,6 +100,19 @@ spec: NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the + service (e.g. api, scheduler, conductor). + type: string + type: object replicas: default: 1 description: Replicas of the service to run @@ -266,6 +279,19 @@ spec: NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the + service (e.g. api, scheduler, conductor). + type: string + type: object override: description: Override, provides the ability to override the generated manifest of several child resources. @@ -551,6 +577,19 @@ spec: description: NodeSelector to target subset of worker nodes running this service type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the + service (e.g. api, scheduler, conductor). + type: string + type: object override: description: Override, provides the ability to override the generated manifest of several child resources. @@ -864,6 +903,19 @@ spec: NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the + service (e.g. api, scheduler, conductor). + type: string + type: object replicas: default: 1 description: Replicas of the service to run. For ironic.IronicDriver diff --git a/config/crd/bases/nova.openstack.org_novacomputes.yaml b/config/crd/bases/nova.openstack.org_novacomputes.yaml index cf4cebcf4..2174664ba 100644 --- a/config/crd/bases/nova.openstack.org_novacomputes.yaml +++ b/config/crd/bases/nova.openstack.org_novacomputes.yaml @@ -96,6 +96,19 @@ spec: description: NodeSelector to target subset of worker nodes running this service type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the service + (e.g. api, scheduler, conductor). + type: string + type: object region: default: regionOne description: Region - the region name to use for service endpoint diff --git a/config/crd/bases/nova.openstack.org_novaconductors.yaml b/config/crd/bases/nova.openstack.org_novaconductors.yaml index bf1311254..5fa019c45 100644 --- a/config/crd/bases/nova.openstack.org_novaconductors.yaml +++ b/config/crd/bases/nova.openstack.org_novaconductors.yaml @@ -133,6 +133,19 @@ spec: description: NodeSelector to target subset of worker nodes running this service type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the service + (e.g. api, scheduler, conductor). + type: string + type: object preserveJobs: default: false description: PreserveJobs - do not delete jobs after they finished diff --git a/config/crd/bases/nova.openstack.org_novametadata.yaml b/config/crd/bases/nova.openstack.org_novametadata.yaml index e113ff0c0..49c17f041 100644 --- a/config/crd/bases/nova.openstack.org_novametadata.yaml +++ b/config/crd/bases/nova.openstack.org_novametadata.yaml @@ -120,6 +120,19 @@ spec: description: NodeSelector to target subset of worker nodes running this service type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the service + (e.g. api, scheduler, conductor). + type: string + type: object override: description: Override, provides the ability to override the generated manifest of several child resources. diff --git a/config/crd/bases/nova.openstack.org_novanovncproxies.yaml b/config/crd/bases/nova.openstack.org_novanovncproxies.yaml index 77b96fd57..cce58962c 100644 --- a/config/crd/bases/nova.openstack.org_novanovncproxies.yaml +++ b/config/crd/bases/nova.openstack.org_novanovncproxies.yaml @@ -96,6 +96,19 @@ spec: description: NodeSelector to target subset of worker nodes running this service type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the service + (e.g. api, scheduler, conductor). + type: string + type: object override: description: Override, provides the ability to override the generated manifest of several child resources. diff --git a/config/crd/bases/nova.openstack.org_novaschedulers.yaml b/config/crd/bases/nova.openstack.org_novaschedulers.yaml index 3bb5934cb..5f11981fe 100644 --- a/config/crd/bases/nova.openstack.org_novaschedulers.yaml +++ b/config/crd/bases/nova.openstack.org_novaschedulers.yaml @@ -101,6 +101,19 @@ spec: description: NodeSelector to target subset of worker nodes running this service type: object + openStackServiceIdentity: + description: OpenStackServiceIdentity names the logical OpenStack + service and component for this CR instance. + properties: + openstackService: + description: OpenstackService is the logical OpenStack service + name (e.g. nova). + type: string + serviceComponent: + description: ServiceComponent is the component within the service + (e.g. api, scheduler, conductor). + type: string + type: object region: default: regionOne description: Region - the region name to use for service endpoint