openstack-k8s-operators · openshift-merge-bot · Dec 9, 2024 · Dec 6, 2024
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -8,6 +8,7 @@ spec:
     - name: ANSIBLE_FORCE_COLOR
       value: "True"
   services:
+    - redhat
     - bootstrap
     - download-cache
     - configure-network
@@ -53,15 +54,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
@@ -0,0 +1,6 @@
+apiVersion: dataplane.openstack.org/v1beta1
+kind: OpenStackDataPlaneService
+metadata:
+  name: redhat
+spec:
+  playbook: osp.edpm.redhat
diff --git a/docs/assemblies/con_data-plane-services.adoc b/docs/assemblies/con_data-plane-services.adoc
@@ -30,6 +30,7 @@ The default list of services as they will appear on the `services` field on an
 
 ----
 services:
+  - redhat
   - download-cache
   - bootstrap
   - configure-network