diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-12-11 16:22:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-11 16:22:23 +0000 |
| commit | 08d51f365efe1359688307aac726ecab2b8fdfea (patch) | |
| tree | 4644a54ec1196147af0e5be4b5f17bc4b0ce1463 | |
| parent | fa7d8eca1d0a6d07284b9df4aa32dc873ec2f761 (diff) | |
| parent | c3316c713c936b154b979aa985a400f4b791c0cb (diff) | |
Merge "[baremetal] Migrate public bridge to ovs" into stable/euphrates
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 | 35 | ||||
| m--------- | mcp/reclass/classes/system | 0 |
2 files changed, 25 insertions, 10 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 index 687777b2c..cad407f57 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 @@ -27,6 +27,8 @@ {%- set vlan_mgmt = conf['net_config']['mgmt']['vlan'] -%} {%- set vlan_private = conf['net_config']['private']['vlan'] -%} {%- set vlan_public = conf['net_config']['public']['vlan'] -%} + + {%- set gateway_public = conf['net_config']['public']['gateway'] -%} {%- else -%} {%- set nic_admin = 'enp6s0' -%} {%- set nic_mgmt = 'enp6s0' -%} @@ -90,18 +92,31 @@ parameters: enabled: true type: ovs_bridge mtu: ${_param:interface_mtu} - float-to-ex: - enabled: true - type: ovs_port - mtu: ${_param:interface_mtu} - bridge: br-floating br-ex: enabled: true - type: bridge + type: ovs_bridge mtu: ${_param:interface_mtu} address: ${_param:external_address} netmask: 255.255.255.0 - use_interfaces: - - {{ nic_public }}{% if vlan_public and vlan_public != 'native' %}.{{ vlan_public }}{% endif %} - use_ovs_ports: - - float-to-ex + proto: static + gateway: {{ gateway_public }} + floating-to-ex: + enabled: true + type: ovs_port + port_type: patch + bridge: br-floating + peer: ex-to-floating + ex-to-floating: + enabled: true + type: ovs_port + port_type: patch + bridge: br-ex + peer: floating-to-ex + public_ovs_interface: + enabled: true + name: {{ nic_public }}{% if vlan_public and vlan_public != 'native' %}.{{ vlan_public }}{% endif %} + proto: manual + ovs_port_type: OVSPort + type: ovs_port + ovs_bridge: br-ex + bridge: br-ex diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system -Subproject 3177fc88357ef2ac21c09509d4210245c37a4f6 +Subproject 0a17807f39aac95f9e0de8643f64e5116bdd1a1 |