diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-07-30 12:25:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-07-30 12:25:37 +0000 |
| commit | bb55bb795bd8f47598a38d445e0083fb6ca96b50 (patch) | |
| tree | 620356422b2d20b5255022719e87ccba969139f6 | |
| parent | 5aca58b8deeec57b22249bb1d386de20ab7c2240 (diff) | |
| parent | ba5bd9abdab0abe2213f5f80e7ffff123ac2c9c8 (diff) | |
Merge "[odl/noha] Simplify net scheme on compute nodes"
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 index 18b73d7ea..65792e35e 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 @@ -49,28 +49,20 @@ parameters: {%- endif %} external_interface: enabled: true - type: eth name: ${_param:external_interface} - mtu: ${_param:interface_mtu} proto: manual - br-floating: - enabled: true - type: ovs_bridge - mtu: ${_param:interface_mtu} - float-to-ex: - enabled: true + ovs_port_type: OVSPort type: ovs_port - mtu: ${_param:interface_mtu} + ovs_bridge: br-floating bridge: br-floating - br-ex: + br-floating: enabled: true - type: bridge + type: ovs_bridge mtu: ${_param:interface_mtu} + proto: static address: ${_param:external_address} netmask: ${_param:opnfv_net_public_mask} use_interfaces: - ${_param:external_interface} - use_ovs_ports: - - float-to-ex gateway: ${_param:opnfv_net_public_gw} name_servers: {{ nm.dns_public }} |