Merge pull request openstack-k8s-operators#1173 from fao89/OSPRH-11281

Update registry login docs
olliewalsh · Nov 7, 2024 · ae4d2d2 · ae4d2d2
2 parents df64f5b + 772d2c4
commit ae4d2d2
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 21 deletions.
diff --git a/config/samples/dataplane/bgp/values.yaml b/config/samples/dataplane/bgp/values.yaml
@@ -13,7 +13,6 @@ data:
           # CHANGEME -- see https://access.redhat.com/solutions/253273
           # edpm_bootstrap_command: |
           #       subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }}
-          #       podman login -u {{ registry_username }} -p {{ registry_password }} registry.redhat.io
           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
@@ -13,7 +13,6 @@ data:
           # CHANGEME -- see https://access.redhat.com/solutions/253273
           # edpm_bootstrap_command: |
           #       subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }}
-          #       podman login -u {{ registry_username }} -p {{ registry_password }} registry.redhat.io
           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
@@ -13,7 +13,6 @@ data:
           # CHANGEME -- see https://access.redhat.com/solutions/253273
           # edpm_bootstrap_command: |
           #       subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }}
-          #       podman login -u {{ registry_username }} -p {{ registry_password }} registry.redhat.io
 
           neutron_public_interface_name: enp7s0
           ctlplane_dns_nameservers:

diff --git a/config/samples/dataplane/networker/values.yaml b/config/samples/dataplane/networker/values.yaml
@@ -13,7 +13,6 @@ data:
           # CHANGEME -- see https://access.redhat.com/solutions/253273
           # edpm_bootstrap_command: |
           #       subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }}
-          #       podman login -u {{ registry_username }} -p {{ registry_password }} registry.redhat.io
           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
@@ -13,7 +13,6 @@ data:
           # CHANGEME -- see https://access.redhat.com/solutions/253273
           # edpm_bootstrap_command: |
           #       subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }}
-          #       podman login -u {{ registry_username }} -p {{ registry_password }} registry.redhat.io
           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
@@ -19,7 +19,6 @@ data:
           # CHANGEME -- see https://access.redhat.com/solutions/253273
           # edpm_bootstrap_command: |
           #       subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }}
-          #       podman login -u {{ registry_username }} -p {{ registry_password }} registry.redhat.io
           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
@@ -15,7 +15,6 @@ data:
           # CHANGEME -- see https://access.redhat.com/solutions/253273
           # edpm_bootstrap_command: |
           #       subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }}
-          #       podman login -u {{ registry_username }} -p {{ registry_password }} registry.redhat.io
           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/pre_ceph_hci/values.yaml b/config/samples/dataplane/pre_ceph_hci/values.yaml
@@ -15,7 +15,6 @@ data:
           # CHANGEME -- see https://access.redhat.com/solutions/253273
           # edpm_bootstrap_command: |
           #       subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }}
-          #       podman login -u {{ registry_username }} -p {{ registry_password }} registry.redhat.io
           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
@@ -56,14 +56,12 @@ spec:
         # - prefix: subscription_manager_
         #   secretRef:
         #     name: subscription-manager
-        # - prefix: registry_
-        #   secretRef:
+        # - 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 }}
-         #       podman login -u {{ registry_username }} -p {{ registry_password }} registry.redhat.io
          edpm_nodes_validation_validate_controllers_icmp: false
          edpm_nodes_validation_validate_gateway_icmp: false
          gather_facts: false

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
@@ -168,13 +168,8 @@ data:
 
 +
 ----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: redhat-registry
-data:
-  username: <registry_username>
-  password: <registry_password>
+$ oc create secret generic redhat-registry \
+--from-literal edpm_container_registry_logins='{"registry.redhat.io": {"<registry_username>": "<registry_password>"}}'
 ----
 +
 * Replace `<registry_username>` with the applicable user name.
@@ -198,13 +193,11 @@ spec:
           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
-          podman login -u {{ registry_username }} -p {{ registry_password }} registry.redhat.io
       ansibleVarsFrom:
       - prefix: subscription_manager_
         secretRef:
           name: subscription-manager
-      - prefix: registry_
-        secretRef:
+      - secretRef:
           name: redhat-registry
 ----