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 7a1a1f82c4..c11b936f5e 100644 --- a/extraconfig/nova_metadata/krb-service-principals/role.role.j2.yaml +++ b/extraconfig/nova_metadata/krb-service-principals/role.role.j2.yaml @@ -61,11 +61,7 @@ resources: role_networks: - ctlplane {%- for network in networks if network.name in role.networks %} - {%- if network.service_net_map_replace is defined %} - - {{network.service_net_map_replace}} - {%- else %} - {{network.name_lower}} - {%- endif %} {%- endfor %} # Generates entries for nova metadata with the following format: @@ -82,29 +78,13 @@ resources: fqdns: {%- for network in networks if network.vip|default(false) and network.name in role.networks %} {%- if network.name == 'External' %} - {%- 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' %} - {%- 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' %} - {%- 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: CloudName{{network.name}}} - {%- else %} {{network.name_lower}}: {get_param: CloudName{{network.name}}} - {%- endif %} {%- endif %} {%- endfor %} ctlplane: {get_param: CloudNameCtlplane}