diff --git a/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml index 5cf26d9a5..3293d3fb9 100644 --- a/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml +++ b/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml @@ -900,6 +900,7 @@ spec: type: integer services: default: + - redhat - download-cache - bootstrap - configure-network diff --git a/apis/dataplane/v1beta1/openstackdataplanenodeset_types.go b/apis/dataplane/v1beta1/openstackdataplanenodeset_types.go index bb2527700..32b1a1609 100644 --- a/apis/dataplane/v1beta1/openstackdataplanenodeset_types.go +++ b/apis/dataplane/v1beta1/openstackdataplanenodeset_types.go @@ -61,7 +61,7 @@ type OpenStackDataPlaneNodeSetSpec struct { NetworkAttachments []string `json:"networkAttachments,omitempty"` // +kubebuilder:validation:Optional - // +kubebuilder:default={download-cache,bootstrap,configure-network,validate-network,install-os,configure-os,ssh-known-hosts,run-os,reboot-os,install-certs,ovn,neutron-metadata,libvirt,nova,telemetry} + // +kubebuilder:default={redhat,download-cache,bootstrap,configure-network,validate-network,install-os,configure-os,ssh-known-hosts,run-os,reboot-os,install-certs,ovn,neutron-metadata,libvirt,nova,telemetry} // Services list Services []string `json:"services"` diff --git a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml index 5cf26d9a5..3293d3fb9 100644 --- a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml +++ b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml @@ -900,6 +900,7 @@ spec: type: integer services: default: + - redhat - download-cache - bootstrap - configure-network diff --git a/config/manifests/bases/openstack-operator.clusterserviceversion.yaml b/config/manifests/bases/openstack-operator.clusterserviceversion.yaml index f44cee10a..e0181c04e 100644 --- a/config/manifests/bases/openstack-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/openstack-operator.clusterserviceversion.yaml @@ -267,7 +267,7 @@ spec: displayName: Template path: neutron.template - description: NodeSelector to target subset of worker nodes running control - plane services (currently only applies to KeystoneAPI and PlacementAPI) + plane services displayName: Node Selector path: nodeSelector - description: Nova - Parameters related to the Nova services @@ -374,6 +374,9 @@ spec: - description: Templates - Overrides to use when creating the Rabbitmq clusters displayName: Templates path: rabbitmq.templates + - description: NodeSelector to target subset of worker nodes running this service + displayName: Node Selector + path: rabbitmq.templates.nodeSelector - description: Enabled - Whether the Redis service should be deployed and managed displayName: Enabled path: redis.enabled diff --git a/config/samples/dataplane/bgp/values.yaml b/config/samples/dataplane/bgp/values.yaml index 5ab56eb3e..45c531ee2 100644 --- a/config/samples/dataplane/bgp/values.yaml +++ b/config/samples/dataplane/bgp/values.yaml @@ -10,9 +10,6 @@ data: nodetemplate: ansible: vars: - # CHANGEME -- see https://access.redhat.com/solutions/253273 - # edpm_bootstrap_command: | - # subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }} timesync_ntp_servers: - hostname: pool.ntp.org # edpm_network_config diff --git a/config/samples/dataplane/bgp_ovn_cluster/values.yaml b/config/samples/dataplane/bgp_ovn_cluster/values.yaml index 17288f2c8..ae5a28cce 100644 --- a/config/samples/dataplane/bgp_ovn_cluster/values.yaml +++ b/config/samples/dataplane/bgp_ovn_cluster/values.yaml @@ -10,9 +10,6 @@ data: nodetemplate: ansible: vars: - # CHANGEME -- see https://access.redhat.com/solutions/253273 - # edpm_bootstrap_command: | - # subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }} timesync_ntp_servers: - hostname: pool.ntp.org # edpm_network_config diff --git a/config/samples/dataplane/customnetworks/values.yaml b/config/samples/dataplane/customnetworks/values.yaml index aae76ca35..0b0c6bebd 100644 --- a/config/samples/dataplane/customnetworks/values.yaml +++ b/config/samples/dataplane/customnetworks/values.yaml @@ -10,10 +10,6 @@ data: nodetemplate: ansible: vars: - # CHANGEME -- see https://access.redhat.com/solutions/253273 - # edpm_bootstrap_command: | - # subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }} - neutron_public_interface_name: enp7s0 ctlplane_dns_nameservers: - 192.168.1.254 diff --git a/config/samples/dataplane/networker/values.yaml b/config/samples/dataplane/networker/values.yaml index 350003e98..b3318038d 100644 --- a/config/samples/dataplane/networker/values.yaml +++ b/config/samples/dataplane/networker/values.yaml @@ -10,9 +10,6 @@ data: nodetemplate: ansible: vars: - # CHANGEME -- see https://access.redhat.com/solutions/253273 - # edpm_bootstrap_command: | - # subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }} edpm_enable_chassis_gw: true nodes: edpm-networker-0: diff --git a/config/samples/dataplane/nmstate/values.yaml b/config/samples/dataplane/nmstate/values.yaml index 431857f49..26af1b7b6 100644 --- a/config/samples/dataplane/nmstate/values.yaml +++ b/config/samples/dataplane/nmstate/values.yaml @@ -10,9 +10,6 @@ data: nodetemplate: ansible: vars: - # CHANGEME -- see https://access.redhat.com/solutions/253273 - # edpm_bootstrap_command: | - # subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }} edpm_network_config_hide_sensitive_logs: false edpm_network_config_template: | --- diff --git a/config/samples/dataplane/ovs_dpdk/values.yaml b/config/samples/dataplane/ovs_dpdk/values.yaml index d84b15921..90f742dfc 100644 --- a/config/samples/dataplane/ovs_dpdk/values.yaml +++ b/config/samples/dataplane/ovs_dpdk/values.yaml @@ -16,9 +16,6 @@ data: nodetemplate: ansible: vars: - # CHANGEME -- see https://access.redhat.com/solutions/253273 - # edpm_bootstrap_command: | - # subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }} edpm_network_config_hide_sensitive_logs: false edpm_network_config_template: | --- diff --git a/config/samples/dataplane/post_ceph_hci/values.yaml b/config/samples/dataplane/post_ceph_hci/values.yaml index 4aef7ef12..f2cb13e31 100644 --- a/config/samples/dataplane/post_ceph_hci/values.yaml +++ b/config/samples/dataplane/post_ceph_hci/values.yaml @@ -12,9 +12,6 @@ data: vars: timesync_ntp_servers: - hostname: clock.redhat.com - # CHANGEME -- see https://access.redhat.com/solutions/253273 - # edpm_bootstrap_command: | - # subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }} edpm_iscsid_image: '{{ registry_url }}/openstack-iscsid:{{ image_tag }}' edpm_logrotate_crond_image: '{{ registry_url }}/openstack-cron:{{ image_tag }}' edpm_network_config_hide_sensitive_logs: false diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml index 574737238..7c832284b 100644 --- a/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml +++ b/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml @@ -53,15 +53,11 @@ spec: configMapRef: name: neutron-edpm # CHANGEME -- see https://access.redhat.com/solutions/253273 - # - prefix: subscription_manager_ - # secretRef: + # - secretRef: # name: subscription-manager # - secretRef: # name: redhat-registry ansibleVars: - # CHANGEME -- see https://access.redhat.com/solutions/253273 - # edpm_bootstrap_command: | - # subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }} edpm_nodes_validation_validate_controllers_icmp: false edpm_nodes_validation_validate_gateway_icmp: false gather_facts: false diff --git a/config/services/dataplane_v1beta1_openstackdataplaneservice_redhat.yaml b/config/services/dataplane_v1beta1_openstackdataplaneservice_redhat.yaml new file mode 100644 index 000000000..22a3b2308 --- /dev/null +++ b/config/services/dataplane_v1beta1_openstackdataplaneservice_redhat.yaml @@ -0,0 +1,6 @@ +apiVersion: dataplane.openstack.org/v1beta1 +kind: OpenStackDataPlaneService +metadata: + name: redhat +spec: + playbook: osp.edpm.redhat diff --git a/docs/assemblies/ctlplane_resources.adoc b/docs/assemblies/ctlplane_resources.adoc index 611bed323..28ac650a3 100644 --- a/docs/assemblies/ctlplane_resources.adoc +++ b/docs/assemblies/ctlplane_resources.adoc @@ -41,6 +41,7 @@ * <> * <> * <> +* <> * <> * <> * <> @@ -244,6 +245,7 @@ * <> * <> * <> +* <> * <> * <> * <> @@ -417,6 +419,7 @@ * <> * <> * <> +* <> * <> * <> * <> @@ -616,8 +619,8 @@ OpenStackClientSpecCore defines the desired state of OpenStackClient | true | nodeSelector -| NodeSelector to target subset of worker nodes running control plane services (currently only applies to KeystoneAPI and PlacementAPI) -| map[string]string +| NodeSelector to target subset of worker nodes +| *map[string]string | false |=== @@ -1215,7 +1218,7 @@ OpenStackControlPlaneSpec defines the desired state of OpenStackControlPlane | true | nodeSelector -| NodeSelector to target subset of worker nodes running control plane services (currently only applies to KeystoneAPI and PlacementAPI) +| NodeSelector to target subset of worker nodes running control plane services | map[string]string | false @@ -1524,6 +1527,22 @@ RabbitmqSection defines the desired state of RabbitMQ service <> +[#rabbitmqtemplate] +==== RabbitmqTemplate + +RabbitmqTemplate definition + +|=== +| Field | Description | Scheme | Required + +| nodeSelector +| NodeSelector to target subset of worker nodes running this service +| *map[string]string +| false +|=== + +<> + [#redissection] ==== RedisSection @@ -2387,17 +2406,17 @@ BarbicanSpec defines the desired state of Barbican | Field | Description | Scheme | Required | barbicanAPI -| +| BarbicanAPI - Spec definition for the API services of this Barbican deployment | <> | true | barbicanWorker -| +| BarbicanWorker - Spec definition for the Worker service of this Barbican deployment | <> | true | barbicanKeystoneListener -| +| BarbicanKeystoneListener - Spec definition for the KeystoneListener service of this Barbican deployment | <> | true |=== @@ -2419,7 +2438,7 @@ BarbicanSpecBase - | nodeSelector | NodeSelector to target subset of worker nodes running this component. Setting here overrides any global NodeSelector settings within the Barbican CR. -| map[string]string +| *map[string]string | false | customServiceConfig @@ -2444,17 +2463,17 @@ BarbicanSpecCore defines the desired state of Barbican, for use with the OpenSta | Field | Description | Scheme | Required | barbicanAPI -| +| BarbicanAPI - Spec definition for the API services of this Barbican deployment | <> | true | barbicanWorker -| +| BarbicanWorker - Spec definition for the Worker service of this Barbican deployment | <> | true | barbicanKeystoneListener -| +| BarbicanKeystoneListener - Spec definition for the KeystoneListener service of this Barbican deployment | <> | true |=== @@ -2944,7 +2963,7 @@ BarbicanComponentTemplate - Variables used by every sub-component of Barbican (e | nodeSelector | NodeSelector to target subset of worker nodes running this component. Setting here overrides any global NodeSelector settings within the Barbican CR. -| map[string]string +| *map[string]string | false | replicas @@ -3023,11 +3042,6 @@ BarbicanTemplate defines common Spec elements for all Barbican components includ | <> | true -| customServiceConfig -| CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/++++++/++++++.conf.d directory as custom.conf file.++++++++++++ -| string -| false - | serviceAccount | ServiceAccount - service account name used internally to provide Barbican services the default SA name | string @@ -3199,7 +3213,7 @@ CinderSpec defines the desired state of Cinder | nodeSelector | NodeSelector to target subset of worker nodes running this service. Setting NodeSelector here acts as a default value and can be overridden by service specific NodeSelector Settings. -| map[string]string +| *map[string]string | false | dbPurge @@ -3978,7 +3992,7 @@ CinderServiceTemplate defines the input parameters that can be defined for a giv | nodeSelector | NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Cinder CR. -| map[string]string +| *map[string]string | false | customServiceConfig @@ -4077,7 +4091,7 @@ DesignateServiceTemplate defines the input parameters that can be defined for a | nodeSelector | NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Designate CR. -| map[string]string +| *map[string]string | false | customServiceConfig @@ -4344,7 +4358,7 @@ DesignateSpecBase - | nodeSelector | NodeSelector to target subset of worker nodes running this service -| map[string]string +| *map[string]string | false | preserveJobs @@ -5392,7 +5406,7 @@ GlanceAPITemplate defines the desired state of GlanceAPI | nodeSelector | NodeSelector to target subset of worker nodes running this service -| map[string]string +| *map[string]string | false | customServiceConfig @@ -5650,7 +5664,7 @@ GlanceSpecCore defines the desired state of Glance | nodeSelector | NodeSelector to target subset of worker nodes running this service -| map[string]string +| *map[string]string | false | preserveJobs @@ -5994,7 +6008,7 @@ HeatServiceTemplate - | nodeSelector | NodeSelector to target subset of worker nodes for running the service -| map[string]string +| *map[string]string | false | customServiceConfig @@ -6190,7 +6204,7 @@ HeatSpec defines the desired state of Heat | nodeSelector | NodeSelector to target subset of worker nodes for running the Heat services -| map[string]string +| *map[string]string | false | apiTimeout @@ -6800,7 +6814,7 @@ HorizonSpecBase - | nodeSelector | NodeSelector to target subset of worker nodes running this service -| map[string]string +| *map[string]string | false | defaultConfigOverwrite @@ -6917,7 +6931,7 @@ IronicServiceTemplate defines the common input parameters for Ironic services | nodeSelector | NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Ironic CR -| map[string]string +| *map[string]string | false | resources @@ -7210,7 +7224,7 @@ IronicSpec defines the desired state of Ironic | nodeSelector | NodeSelector to target subset of worker nodes running this service. Setting NodeSelector here acts as a default value and can be overridden by service specific NodeSelector Settings. -| map[string]string +| *map[string]string | false | storageClass @@ -7884,7 +7898,7 @@ IronicInspectorTemplate defines the input parameters for Ironic Inspector servic | nodeSelector | NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Ironic CR -| map[string]string +| *map[string]string | false | preserveJobs @@ -8091,6 +8105,22 @@ APIOverrideSpec to override the generated manifest of several child resources. <> +[#httpdcustomization] +==== HttpdCustomization + +HttpdCustomization - customize the httpd service + +|=== +| Field | Description | Scheme | Required + +| processNumber +| ProcessNumber - Number of processes running in keystone API +| *int32 +| true +|=== + +<> + [#keystoneapi] ==== KeystoneAPI @@ -8237,7 +8267,7 @@ KeystoneAPISpec defines the desired state of KeystoneAPI | nodeSelector | NodeSelector to target subset of worker nodes running this service -| map[string]string +| *map[string]string | false | preserveJobs @@ -8255,6 +8285,11 @@ KeystoneAPISpec defines the desired state of KeystoneAPI | map[string]string | false +| httpdCustomization +| HttpdCustomization - customize the httpd service +| <> +| false + | resources | Resources - Compute Resources required by this service (Limits/Requests). https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ | corev1.ResourceRequirements @@ -8568,7 +8603,7 @@ ManilaServiceTemplate defines the input parameters that can be defined for a giv | nodeSelector | NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Manila CR. -| map[string]string +| *map[string]string | false | customServiceConfig @@ -8822,7 +8857,7 @@ ManilaSpecBase - | nodeSelector | NodeSelector to target subset of worker nodes running this service. Setting NodeSelector here acts as a default value and can be overridden by service specific NodeSelector Settings. -| map[string]string +| *map[string]string | false | dbPurge @@ -9523,7 +9558,7 @@ GaleraSpec defines the desired state of Galera | nodeSelector | NodeSelector to target subset of worker nodes running this service -| map[string]string +| *map[string]string | false | customServiceConfig @@ -9890,6 +9925,11 @@ NeutronAPISpecCore - |=== | Field | Description | Scheme | Required +| apiTimeout +| APITimeout for HAProxy, Apache +| int +| true + | serviceUser | ServiceUser - optional username used for this service to register in neutron | string @@ -9932,7 +9972,7 @@ NeutronAPISpecCore - | nodeSelector | NodeSelector to target subset of worker nodes running this service -| map[string]string +| *map[string]string | false | preserveJobs @@ -10163,7 +10203,7 @@ NovaServiceBase contains the fields that are needed for each nova service CRD | nodeSelector | NodeSelector to target subset of worker nodes running this service -| map[string]string +| *map[string]string | false | customServiceConfig @@ -10307,7 +10347,7 @@ NovaSpecCore defines the template for NovaSpec used in OpenStackControlPlane | nodeSelector | NodeSelector to target subset of worker nodes running this service. Setting NodeSelector here acts as a default value and can be overridden by service specific NodeSelector Settings. -| map[string]string +| *map[string]string | false | preserveJobs @@ -10579,7 +10619,7 @@ NovaAPITemplate defines the input parameters specified by the user to create a N | nodeSelector | NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. -| map[string]string +| *map[string]string | false | customServiceConfig @@ -10708,7 +10748,7 @@ NovaCellSpec defines the desired state of NovaCell | nodeSelector | NodeSelector to target subset of worker nodes running this services. -| map[string]string +| *map[string]string | false | serviceUser @@ -10865,7 +10905,7 @@ NovaCellTemplate defines the input parameters specified by the user to create a | nodeSelector | NodeSelector to target subset of worker nodes running cell. -| map[string]string +| *map[string]string | false | conductorServiceTemplate @@ -11076,7 +11116,7 @@ NovaComputeTemplate defines the input parameters specified by the user to create | nodeSelector | NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. -| map[string]string +| *map[string]string | false | customServiceConfig @@ -11281,7 +11321,7 @@ NovaConductorTemplate defines the input parameters specified by the user to crea | nodeSelector | NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. -| map[string]string +| *map[string]string | false | customServiceConfig @@ -11502,7 +11542,7 @@ NovaMetadataTemplate defines the input parameters specified by the user to creat | nodeSelector | NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. -| map[string]string +| *map[string]string | false | customServiceConfig @@ -11702,7 +11742,7 @@ NovaNoVNCProxyTemplate defines the input parameters specified by the user to cre | nodeSelector | NodeSelector to target subset of worker nodes running this service -| map[string]string +| *map[string]string | false | customServiceConfig @@ -11934,7 +11974,7 @@ NovaSchedulerTemplate defines the input parameters specified by the user to crea | nodeSelector | NodeSelector to target subset of worker nodes running this service. Setting here overrides any global NodeSelector settings within the Nova CR. -| map[string]string +| *map[string]string | false | customServiceConfig @@ -12073,7 +12113,7 @@ OctaviaAmphoraControllerSpecCore - | nodeSelector | NodeSelector to target subset of worker nodes running this service -| map[string]string +| *map[string]string | false | customServiceConfig @@ -12395,7 +12435,7 @@ OctaviaSpecBase - | nodeSelector | NodeSelector to target subset of worker nodes running this service -| map[string]string +| *map[string]string | false | preserveJobs @@ -12455,8 +12495,8 @@ OctaviaSpecBase - | apiTimeout | Octavia API timeout -| string -| false +| int +| true | octaviaNetworkAttachment | OctaviaNetworkAttachment is a NetworkAttachment resource name for the Octavia Management Network @@ -12718,7 +12758,7 @@ OctaviaAPISpecCore - | nodeSelector | NodeSelector to target subset of worker nodes running this service -| map[string]string +| *map[string]string | false | preserveJobs @@ -12760,6 +12800,11 @@ OctaviaAPISpecCore - | TLS - Parameters related to the TLS | <> | false + +| apiTimeout +| APITimeout for HAProxy and Apache defaults to OctaviaSpecCore APITimeout (seconds) +| int +| true |=== <> @@ -12902,7 +12947,7 @@ OctaviaRsyslogSpecCore - | nodeSelector | NodeSelector to target subset of worker nodes running this service -| map[string]string +| *map[string]string | false | defaultConfigOverwrite @@ -13366,10 +13411,15 @@ OpenStackBaremetalSetSpec defines the desired state of OpenStackBaremetalSet | false | provisionServerName -| ProvisionServerName - Optional. If supplied will be used as the base Image for the baremetalset instead of baseImageURL. +| ProvisionServerName - Optional. Existing OpenStackProvisionServer to use, else one would be created. | string | false +| provisionServerNodeSelector +| ProvisonServerNodeSelector to target subset of worker nodes running provision server +| map[string]string +| false + | provisioningInterface | ProvisioningInterface - Optional. If not provided along with ProvisionServerName, it would be discovered from CBO. This is the provisioning interface on the OCP masters/workers. | string @@ -13752,7 +13802,7 @@ OVNControllerSpecCore - | nodeSelector | NodeSelector to target subset of worker nodes running this service -| map[string]string +| *map[string]string | false | networkAttachment @@ -13897,6 +13947,22 @@ OVNDBClusterList contains a list of OVNDBCluster <> +[#ovndbclusteroverridespec] +==== OVNDBClusterOverrideSpec + +OVNDBClusterOverrideSpec to override the generated manifest of several child resources. + +|=== +| Field | Description | Scheme | Required + +| service +| Override configuration for the Service created to serve traffic to the cluster. +| *service.OverrideSpec +| false +|=== + +<> + [#ovndbclusterspec] ==== OVNDBClusterSpec @@ -13933,7 +13999,7 @@ OVNDBClusterSpecCore - | nodeSelector | NodeSelector to target subset of worker nodes running this service -| map[string]string +| *map[string]string | false | logLevel @@ -13980,6 +14046,11 @@ OVNDBClusterSpecCore - | TLS - Parameters related to TLS | tls.SimpleService | false + +| override +| Override, provides the ability to override the generated manifest of several child resources. +| <> +| false |=== <> @@ -14108,7 +14179,7 @@ OVNNorthdSpecCore - | nodeSelector | NodeSelector to target subset of worker nodes running this service -| map[string]string +| *map[string]string | false | logLevel @@ -14295,7 +14366,7 @@ PlacementAPISpecCore - | nodeSelector | NodeSelector to target subset of worker nodes running this service -| map[string]string +| *map[string]string | false | preserveJobs @@ -14472,6 +14543,11 @@ SwiftSpecBase - | Memcached instance name. | string | true + +| nodeSelector +| NodeSelector to target subset of worker nodes running this service +| *map[string]string +| false |=== <> @@ -14685,6 +14761,11 @@ SwiftProxySpecCore - | Enables ceilometer in the swift proxy and creates required resources | bool | true + +| nodeSelector +| NodeSelector to target subset of worker nodes running this service +| *map[string]string +| false |=== <> @@ -14854,6 +14935,11 @@ SwiftRingSpec defines the desired state of SwiftRing | TLS - Parameters related to the TLS | tls.Ca | false + +| nodeSelector +| NodeSelector to target subset of worker nodes running this service +| *map[string]string +| false |=== <> @@ -15004,6 +15090,11 @@ SwiftStorageSpecCore - | DefaultConfigOverwrite - can be used to add additionalfiles. Those get added to the service config dir in /etc/++++++-conf.d++++++ | map[string]string | false + +| nodeSelector +| NodeSelector to target subset of worker nodes running this service +| *map[string]string +| false |=== <> @@ -15099,6 +15190,11 @@ Aodh defines the aodh component spec |=== | Field | Description | Scheme | Required +| apiTimeout +| APITimeout for Route and Apache +| int +| true + | rabbitMqClusterName | RabbitMQ instance name Needed to request a transportURL that is created and used in Aodh | string @@ -15163,6 +15259,11 @@ Aodh defines the aodh component spec | TLS - Parameters related to the TLS | tls.API | false + +| nodeSelector +| NodeSelector to target subset of worker nodes running this service +| *map[string]string +| false |=== <> @@ -15449,6 +15550,11 @@ CeilometerSpecCore defines the desired state of Ceilometer. This version is used |=== | Field | Description | Scheme | Required +| apiTimeout +| APITimeout for Apache +| int +| true + | rabbitMqClusterName | RabbitMQ instance name Needed to request a transportURL that is created and used in Telemetry | string @@ -15493,6 +15599,11 @@ CeilometerSpecCore defines the desired state of Ceilometer. This version is used | KSMTLS - Parameters related to the TLS for kube-state-metrics | tls.SimpleService | false + +| nodeSelector +| NodeSelector to target subset of worker nodes running this service +| *map[string]string +| false |=== <> @@ -16077,6 +16188,11 @@ TelemetrySpecBase - | Logging - Parameters related to the logging | <> | false + +| nodeSelector +| NodeSelector to target subset of worker nodes running this service +| *map[string]string +| false |=== <> @@ -16206,7 +16322,7 @@ MemcachedSpecCore - this version is used by the OpenStackControlplane CR (no con | nodeSelector | NodeSelector to target subset of worker nodes running this service -| map[string]string +| *map[string]string | false | tls @@ -16498,7 +16614,7 @@ DNSMasqSpecCore - this version is used by the OpenStackControlplane CR (no conta | nodeSelector | NodeSelector to target subset of worker nodes running this service. Setting NodeSelector here acts as a default value and can be overridden by service specific NodeSelector Settings. -| map[string]string +| *map[string]string | false | dnsDataLabelSelectorValue diff --git a/docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc b/docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc index 31a10ddee..f1acce8bd 100644 --- a/docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc +++ b/docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc @@ -154,13 +154,8 @@ ifeval::["{build}" == "downstream"] . Register the operating system of the nodes that are not registered to the Red Hat Customer Portal, and enable repositories for your nodes: + ---- -apiVersion: v1 -kind: Secret -metadata: - name: subscription-manager -data: - username: - password: +$ oc create secret generic subscription-manager \ +--from-literal rhc_auth='{"username": "", "password": ""}' ---- + * Replace `` with the applicable user name. @@ -188,14 +183,8 @@ spec: ansible: ... ansibleVars: - edpm_bootstrap_command: | - subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }} - subscription-manager release --set=9.2 - subscription-manager repos --disable=* - subscription-manager repos --enable=rhel-9-for-x86_64-baseos-eus-rpms --enable=rhel-9-for-x86_64-appstream-eus-rpms --enable=rhel-9-for-x86_64-highavailability-eus-rpms --enable=openstack-17.1-for-rhel-9-x86_64-rpms --enable=fast-datapath-for-rhel-9-x86_64-rpms --enable=openstack-dev-preview-for-rhel-9-x86_64-rpms ansibleVarsFrom: - - prefix: subscription_manager_ - secretRef: + - secretRef: name: subscription-manager - secretRef: name: redhat-registry @@ -215,6 +204,21 @@ metadata: name: openstack-edpm-ipam spec: ... + nodeTemplate: + ... + ansible: + ... + ansibleVars: + rhc_release: 9.2 + rhc_repositories: + - {name: "*", state: disabled} + - {name: "rhel-9-for-x86_64-baseos-eus-rpms", state: enabled} + - {name: "rhel-9-for-x86_64-appstream-eus-rpms", state: enabled} + - {name: "rhel-9-for-x86_64-highavailability-eus-rpms", state: enabled} + - {name: "openstack-17.1-for-rhel-9-x86_64-rpms", state: enabled} + - {name: "fast-datapath-for-rhel-9-x86_64-rpms", state: enabled} + - {name: "openstack-dev-preview-for-rhel-9-x86_64-rpms", state: enabled} + ... nodes: edpm-compute-0: <1> hostName: edpm-compute-0 diff --git a/tests/functional/dataplane/openstackdataplanenodeset_controller_test.go b/tests/functional/dataplane/openstackdataplanenodeset_controller_test.go index 1780e5805..184c225ef 100644 --- a/tests/functional/dataplane/openstackdataplanenodeset_controller_test.go +++ b/tests/functional/dataplane/openstackdataplanenodeset_controller_test.go @@ -355,6 +355,7 @@ var _ = Describe("Dataplane NodeSet Test", func() { }, }, Services: []string{ + "redhat", "download-cache", "bootstrap", "configure-network", @@ -404,6 +405,7 @@ var _ = Describe("Dataplane NodeSet Test", func() { BeforeEach(func() { nodeSetSpec := DefaultDataPlaneNoNodeSetSpec(tlsEnabled) nodeSetSpec["services"] = []string{ + "redhat", "download-cache", "bootstrap", "configure-network", @@ -494,6 +496,7 @@ var _ = Describe("Dataplane NodeSet Test", func() { }, }, Services: []string{ + "redhat", "download-cache", "bootstrap", "configure-network", @@ -948,6 +951,7 @@ var _ = Describe("Dataplane NodeSet Test", func() { }, }, Services: []string{ + "redhat", "download-cache", "bootstrap", "configure-network",