diff options
Diffstat (limited to 'mcp/reclass/classes/cluster')
| -rw-r--r-- | mcp/reclass/classes/cluster/.gitignore | 10 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2 (renamed from mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml) | 0 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 | 3 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/mcp/reclass/classes/cluster/.gitignore b/mcp/reclass/classes/cluster/.gitignore index 733689355..9266b7cbc 100644 --- a/mcp/reclass/classes/cluster/.gitignore +++ b/mcp/reclass/classes/cluster/.gitignore @@ -12,15 +12,9 @@ mcp*common-*/openstack_init.yml mcp-common-ha/openstack_interface_vcp_biport.yml mcp-common-ha/openstack_interface_vcp_triport.yml mcp-common-ha/openstack_proxy.yml -mcp-ovs-ha/infra/init_vcp.yml -mcp-ovs-ha/infra/kvm.yml -mcp-ovs-dpdk-ha/infra/init_vcp.yml -mcp-ovs-dpdk-ha/infra/kvm.yml -mcp-odl-ha/infra/init_vcp.yml -mcp-odl-ha/infra/kvm.yml +mcp-*-ha/infra/kvm.yml +mcp-*-ha/infra/init_vcp.yml mcp-odl-ha/infra/maas.yml -mcp-ovn-ha/infra/init_vcp.yml -mcp-ovn-ha/infra/kvm.yml mcp-odl-ha/opendaylight/control.yml mcp-odl-ha/openstack/init.yml mcp-odl-noha/infra/config.yml diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2 index 62af0893a..62af0893a 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2 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 e9c91ea91..bde5e7ac1 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 @@ -60,6 +60,9 @@ parameters: br-floating: enabled: true type: ovs_bridge +{%- if conf.MCP_DPDK_MODE %} + datapath_type: netdev +{%- endif %} mtu: ${_param:interface_mtu} proto: static address: ${_param:external_address} diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 index 0bf5502ba..6b445901b 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 @@ -7,7 +7,7 @@ ############################################################################## {%- import 'net_map.j2' as nm with context %} {%- import 'net_macros.j2' as ma with context %} -{%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %} +{%- set vlan_private_start = 0 if conf.MCP_DPDK_MODE else (nm.vlan_private | string).rsplit('-')[0] %} --- classes: - cluster.mcp-common-noha.openstack_gateway |