diff options
| -rwxr-xr-x | mcp/config/states/networks | 3 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 | 29 | ||||
| -rw-r--r-- | mcp/scripts/docker-compose/docker-compose.yaml.j2 | 4 |
3 files changed, 32 insertions, 4 deletions
diff --git a/mcp/config/states/networks b/mcp/config/states/networks index e9a9f5190..e0d2aeea3 100755 --- a/mcp/config/states/networks +++ b/mcp/config/states/networks @@ -38,3 +38,6 @@ salt -C 'I@nova:controller and *01*' cmd.run ". /root/keystonercv3; \ # Discover compute hosts after they are registered salt -C 'I@nova:controller and *01*' state.sls_id nova_controller_discover_hosts nova + +# Set datapath type to netdev for public bridge +((MCP_DPDK_MODE)) && salt -I 'nova:compute' cmd.run 'ovs-vsctl set bridge br-floating datapath_type=netdev' || /bin/true 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 0eb133329..0ad368611 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 @@ -39,6 +39,30 @@ parameters: netmask: ${_param:opnfv_net_private_mask} {{ nm.cmp001.nic_private }}: type: dpdk # Not a meaningful type, just match 'dpdk' for filtering + {{ nm.cmp001.nic_public }}: + enabled: true + type: eth + mtu: ${_param:interface_mtu} + proto: manual + br-floating: + enabled: true + type: ovs_bridge + float-to-ex: + enabled: true + type: ovs_port + mtu: ${_param:interface_mtu} + bridge: br-floating + br-ex: + enabled: true + type: bridge + address: ${_param:external_address} + netmask: ${_param:opnfv_net_public_mask} + use_interfaces: + - {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }} + use_ovs_ports: + - float-to-ex + gateway: ${_param:opnfv_net_public_gw} + name_servers: {{ nm.dns_public }} {%- else %} br-mesh: enabled: true @@ -48,7 +72,6 @@ parameters: netmask: ${_param:opnfv_net_private_mask} use_interfaces: - {{ ma.interface_str(nm.cmp001.nic_private, vlan_private_start) }} -{%- endif %} ovs_port_{{ nm.cmp001.nic_public }}: enabled: true name: {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }} @@ -61,9 +84,6 @@ parameters: br-floating: enabled: true type: ovs_bridge -{%- if conf.MCP_DPDK_MODE %} - datapath_type: netdev -{%- endif %} proto: static address: ${_param:external_address} netmask: ${_param:opnfv_net_public_mask} @@ -72,3 +92,4 @@ parameters: gateway: ${_param:opnfv_net_public_gw} name_servers: {{ nm.dns_public }} noifupdown: true +{%- endif %} diff --git a/mcp/scripts/docker-compose/docker-compose.yaml.j2 b/mcp/scripts/docker-compose/docker-compose.yaml.j2 index 54315978e..7099e4fda 100644 --- a/mcp/scripts/docker-compose/docker-compose.yaml.j2 +++ b/mcp/scripts/docker-compose/docker-compose.yaml.j2 @@ -52,7 +52,11 @@ networks: mgmt: driver: macvlan driver_opts: +{%- if conf.idf.fuel.jumphost.get('trunks', {}).get('mgmt', False) %} parent: {{ ma.interface_str('veth_mcp5', nm.vlan_mgmt) }} +{%- else %} + parent: veth_mcp5 # Untagged by default +{%- endif %} ipam: config: - subnet: {{ nm.net_mgmt }} |