VLAN creation failed due to bridge_name not substituted

[Zhu Shengli]

Description
===========

I created a ovs bridge specifically for external network as the following template.

```
      - type: ovs_bridge
        name: bridge_name
        addresses:
        - ip_netmask:
            list_join:
            - /
            - - {get_param: ControlPlaneIp}
              - {get_param: ControlPlaneSubnetCidr}
        members:
          - type: interface
            name: interface_name
      - type: vlan
        device: bridge_name
        vlan_id:
          {get_param: ExternalNetworkVlanID}
        addresses:
          - ip_netmask:
              {get_param: ExternalIpSubnet}
```

But the deployment failed during this network because the bridge_name in the vlan definition was not substituded at all. The relevant code in generated /etc/os-net-config/config.json was kind like:

```
{"addresses": [{"ip_netmask": "10.1.1.111/24"}], "device": "bridge_name", "routes": [{"default": true, "next_hop": "10.1.1.1"}], "type": "vlan", "vlan_id": 655}
```

I checked the code in `run-os-net-config.sh`. Apparently the sed command only substitutes the first occurrence of bridge_name because it's used without `/g`.

```
    sed -i "s/bridge_name/${bridge_name:-''}/" /etc/os-net-config/config.json
    sed -i "s/interface_name/${interface_name:-''}/" /etc/os-net-config/config.json
```

I know the bridge_name is supposed to be substituted by NeutronExternalNetworkBridge(defaults to br-ex). So is this intentional? We are not supposed to manually add any network on this bridge?

BTW,
The network template snippet above was copied from the documentation of RedHat Openstack Platform.

https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/15/html-single/advanced_overcloud_customization/index#network-interface-reference

Steps to reproduce
==================

add the following code to controller network template and deploy.

```
```
      - type: ovs_bridge
        name: bridge_name
        addresses:
        - ip_netmask:
            list_join:
            - /
            - - {get_param: ControlPlaneIp}
              - {get_param: ControlPlaneSubnetCidr}
        members:
          - type: interface
            name: interface_name
      - type: vlan
        device: bridge_name
        vlan_id:
          {get_param: ExternalNetworkVlanID}
        addresses:
          - ip_netmask:
              {get_param: ExternalIpSubnet}
```

Expected result
===============
VLAN655 was created normally.

Actual result
=============
Deploy failed, VLAN655 was not created.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.opendev.org/714102

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/714102
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=47ca83280cef1ee6756161176ad3aea8060bb08d
Submitter: Zuul
Branch: master

commit 47ca83280cef1ee6756161176ad3aea8060bb08d
Author: Zhu Sheng Li <email address hidden>
Date: Fri Mar 20 19:53:41 2020 +0800

    Replace all the bridge_name variables in templates

    The bridge_name might be used for multiple times, for example,
    in different vlan configurations. All of them should be replaced with
    the actual ${bridge_name} variable.

    Change-Id: I93ee204a526422f113a88b99531583e3cf769382
    Closes-Bug: #1866393

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 12.2.0 release.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/train
Review: https://review.opendev.org/749822

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/749822
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=7eb563da2665e6ff47d14eb823af6d32e08c8f3a
Submitter: Zuul
Branch: stable/train

commit 7eb563da2665e6ff47d14eb823af6d32e08c8f3a
Author: Zhu Sheng Li <email address hidden>
Date: Fri Mar 20 19:53:41 2020 +0800

    Replace all the bridge_name variables in templates

    The bridge_name might be used for multiple times, for example,
    in different vlan configurations. All of them should be replaced with
    the actual ${bridge_name} variable.

    Change-Id: I93ee204a526422f113a88b99531583e3cf769382
    Closes-Bug: #1866393
    (cherry picked from commit 47ca83280cef1ee6756161176ad3aea8060bb08d)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 11.4.0 release.