diff --git a/extraconfig/nova_metadata/krb-service-principals/role.role.j2.yaml b/extraconfig/nova_metadata/krb-service-principals/role.role.j2.yaml index 46597ce79e..8418272936 100644 --- a/extraconfig/nova_metadata/krb-service-principals/role.role.j2.yaml +++ b/extraconfig/nova_metadata/krb-service-principals/role.role.j2.yaml @@ -71,13 +71,29 @@ resources: fqdns: {%- for network in networks if network.vip|default(false) and network.name in role.networks %} {%- if network.name == 'External' %} - external: {get_param: CloudName} + {%- if network.service_net_map_replace is defined %} + {{network.service_net_map_replace}}: {get_param: CloudName} + {%- else %} + {{network.name_lower}}: {get_param: CloudName} + {%- endif %} {%- elif network.name == 'InternalApi' %} - internal_api: {get_param: CloudNameInternal} + {%- if network.service_net_map_replace is defined %} + {{network.service_net_map_replace}}: {get_param: CloudNameInternal} + {%- else %} + {{network.name_lower}}: {get_param: CloudNameInternal} + {%- endif %} {%- elif network.name == 'StorageMgmt' %} - storage_mgmt: {get_param: CloudNameStorageManagement} + {%- if network.service_net_map_replace is defined %} + {{network.service_net_map_replace}}: {get_param: CloudNameStorageManagement} + {%- else %} + {{network.name_lower}}: {get_param: CloudNameStorageManagement} + {%- endif %} {%- else %} + {%- if network.service_net_map_replace is defined %} + {{network.service_net_map_replace}}: {get_param: CloudNameStorageManagement} + {%- else %} {{network.name_lower}}: {get_param: CloudName{{network.name}}} + {%- endif %} {%- endif %} {%- endfor %} ctlplane: {get_param: CloudNameCtlplane} diff --git a/releasenotes/notes/fix-custom-netname-lower-and-tls-everywhere-1f2300f9a2ba4d98.yaml b/releasenotes/notes/fix-custom-netname-lower-and-tls-everywhere-1f2300f9a2ba4d98.yaml new file mode 100644 index 0000000000..11c546490e --- /dev/null +++ b/releasenotes/notes/fix-custom-netname-lower-and-tls-everywhere-1f2300f9a2ba4d98.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Fixes an issue where deployment would fail if a non-default ``name_lower`` + is used in network data for one of the networks: ``External``, + ``InternalApi`` or ``StorageMgmt``. + (See `bug: 1830852 `_.) \ No newline at end of file