From 09733e6e6d17e4f86ed8b09e13e0b77c9575ef0f Mon Sep 17 00:00:00 2001 From: Ferdinando Terada Date: Wed, 26 Mar 2025 09:04:23 -0300 Subject: [PATCH] Remove registry central resolution from dns puppet template This commit removes the name resolution for 'registry.central' within the Puppet template. The objective is to eliminate the use of the distributed cloud role in this context. The configuration is now replaced with the use of a service parameter DNS host record. Test Plan ========= For all the tests below, ensure that the address entry for 'registry.central' is not configured in the dnsmasq.conf file. [PASS] Execute subcloud bootstrap. After deployment, ping registry.central and verify the service-parameter-list. registry.central must be properly configured. [PASS] Execute subcloud bootstrap with the virtual_system flag enabled. After deployment, ping registry.central and verify the service-parameter-list. registry.central must be properly configured. registry.local must also be configured. [PASS] After subcloud deployment, modify registry.central DNS host-record to another IP address and ping. registry.central must be properly configured. [PASS] Execute system controller bootstrap. Check service-parameter-list: registry.central must not be configured. [PASS] Execute subcloud rehoming. After rehoming, registry.central must be updated and point to the new system controller IP address. The address must be reachable and properly configured. [PASS] Execute subcloud rehoming using same OAM/mgmt values. Rehoming must be executed with no failures. registry.central must be reachable and properly configured. [PASS] Execute subcloud rehoming with the virtual system flag enabled. After rehoming, registry.central must be updated and point to the new system controller management IP address. The address must be reachable and properly configured. registry.local must also be properly configured. [PASS] Execute subcloud enrollment. After enrollment, registry.central must be updated and point to the system controller OAM IP address. The address must be reachable and properly configured. [PASS] Execute subcloud enrollment with the virtual system flag enabled. After enrollment, registry.central must be updated and point to the system controller management IP. The address must be reachable and properly configured. registry.local must also be properly configured. [PASS] Execute backup and restore process. registry.central should be restored successfully. [PASS] Execute DC fresh install. registry.central must be properly configured for subcloud. [PASS] Execute AIO-SX fresh install. Check service-parameter-list: registry.central must not be configured. Depends-On: https://review.opendev.org/c/starlingx/ansible-playbooks/+/945991 Story: 2011312 Task: 51903 Change-Id: I431cb0d780187f0ad821f32e2f3c1c21e59c79e7 Signed-off-by: Ferdinando Terada --- .../platform/templates/dnsmasq.conf.erb | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/puppet-manifests/src/modules/platform/templates/dnsmasq.conf.erb b/puppet-manifests/src/modules/platform/templates/dnsmasq.conf.erb index a7e897bec..ab230785d 100644 --- a/puppet-manifests/src/modules/platform/templates/dnsmasq.conf.erb +++ b/puppet-manifests/src/modules/platform/templates/dnsmasq.conf.erb @@ -143,25 +143,3 @@ cname=controller-1,controller-1.internal <%- if @distributed_cloud_role == 'systemcontroller' -%> cname=registry.central,controller <%- end -%> - -<%- if @distributed_cloud_role == 'subcloud' -%> -<%- if @is_virtual_system == true and @sc_mgmt_address != nil -%> -# For virtual subcloud (StarlingX running in Openstack Nova VM - QEMU/KVM), -# there is no physical OAM interface (no external network access) to connect -# to central-cloud's local registry, so central registry is exposed on the -# MGMT interface and "registry.central" domain needs to be set to system -# controller's MGMT IP to allow subcloud to pull images from central registry -# via the MGMT interface. -address=/registry.central/<%= @sc_mgmt_address %> -# The "registry.local" domain needs to be explicitly specified with subcloud's -# MGMT IP as dcorch synchronizes the dns server on subcloud with system controller's -# dns server which cannot be reached on subcloud. -address=/registry.local/<%= @mgmt_controller_address %> -<%- else -%> -# For regular DC, central-cloud's local registry is exposed on the OAM interface -# (to provide the ability to push images externally to central registry), so set -# "registry.central" to system controller's OAM IP on subcloud to allow subcloud -# to pull images from central registry via the OAM interface. -address=/registry.central/<%= @sc_address %> -<%- end -%> -<%- end -%>