diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-12-11 08:16:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-11 08:16:58 +0000 |
| commit | 24dad46d51e6740400effd037f14d99defc5eafd (patch) | |
| tree | e40bc593fc1683faf788d0d74244d670894858af | |
| parent | 8c15c3675d57bfaed9c6923ed8adfdb6879fea49 (diff) | |
| parent | bcba227e4947bf1e6976b2a743b87c28ae9645c9 (diff) | |
Merge "[baremetal] Migrate public bridge to ovs"
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_pdf.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-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_pdf.yml.j2 index 687777b2c..cad407f57 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_pdf.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 79f99eb5c290b346bb663ec8142eb3eafeb0a7e +Subproject 2c7e4f3b9e1b7bb7e52139c34198f9629887caa |