Merge "Make FrrBgpAsn a per-role parameter" into stable/wallaby

deployment/frr/frr-container-ansible.yaml

@@ -62,6 +62,8 @@ parameters:
     default: 64999
     description: Default ASN to be used within FRR
     type: number
+    tags:
+      - role_specific
   FrrBgpIpv4Enabled:
     default: true
     description: Enable BGP advertisement of IPv4 routes
@@ -178,9 +180,11 @@ resources:
         map_replace:
           - map_replace:
             - ContainerFrrImage: ContainerFrrImage
+              frr_asn: FrrBgpAsn
             - values: {get_param: [RoleParameters]}
           - values:
               ContainerFrrImage: {get_param: ContainerFrrImage}
+              FrrBgpAsn: {get_param: FrrBgpAsn}
 outputs:
   role_data:
     description: Role data for the FRR and OVN BGP Agent services
@@ -284,7 +288,7 @@ outputs:
             tripleo_frr_config_basedir: /var/lib/config-data/ansible-generated/frr
             tripleo_frr_bfd: {get_param: FrrBfdEnabled}
             tripleo_frr_bgp: {get_param: FrrBgpEnabled}
-            tripleo_frr_bgp_asn: {get_param: FrrBgpAsn}
+            tripleo_frr_bgp_asn: {get_attr: [RoleParametersValue, value, frr_asn]}
             tripleo_frr_bgp_ipv4: {get_param: FrrBgpIpv4Enabled}
             tripleo_frr_bgp_ipv4_allowas_in: {get_param: FrrBgpIpv4AllowASIn}
             tripleo_frr_bgp_ipv4_src_network: {get_param: FrrBgpIpv4SrcNetwork}