diff options
4 files changed, 14 insertions, 13 deletions
diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml b/mcp/config/scenario/os-odl-ovs-noha.yaml index 84eaf6318..083e7e646 100644 --- a/mcp/config/scenario/os-odl-ovs-noha.yaml +++ b/mcp/config/scenario/os-odl-ovs-noha.yaml @@ -18,8 +18,8 @@ virtual: nodes: - cfg01 - ctl01 - - cmp01 - - cmp02 + - cmp001 + - cmp002 - gtw01 - odl01 ctl01: @@ -30,9 +30,9 @@ virtual: odl01: vcpus: 4 ram: 5120 - cmp01: + cmp001: vcpus: 4 ram: 8192 - cmp02: + cmp002: vcpus: 4 ram: 8192 diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 index 82d446b1f..c129a0a12 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 @@ -55,7 +55,7 @@ parameters: linux_system_codename: xenial {#- No partial defaults, all or nothing. Defaults tuned for lf-pod2. #} - {%- if 'dpdk' in conf.cluster.domain %} + {%- if 'dpdk' in conf.cluster.domain or conf.MCP_DPDK_MODE %} {%- if conf.idf.fuel.reclass is defined %} {%- if conf.idf.fuel.reclass.node[i].compute_params.dpdk is defined %} {#- Can't dump json here due to dpdk0_* below, explicitly create yaml #} diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2 index f25dd60fa..9e7dda947 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2 @@ -11,7 +11,7 @@ classes: - system.reclass.storage.system.openstack_gateway_single - cluster.mcp-common-noha.infra.config - cluster.mcp-odl-noha - - cluster.all-mcp-arch-common.infra.config{%- if conf.MCP_DPDK_MODE %}_dpdk{%- endif %}_pdf + - cluster.all-mcp-arch-common.infra.config_pdf parameters: reclass: storage: 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 c3e79e524..18b73d7ea 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 @@ -37,13 +37,7 @@ parameters: netmask: ${_param:opnfv_net_private_mask} tenant_interface: type: dpdk # Not a meaningful type, just match 'dpdk' for filtering -{%- endif %} - external_interface: - enabled: true - type: eth - name: ${_param:external_interface} - mtu: ${_param:interface_mtu} - proto: manual +{%- else %} br-mesh: enabled: true type: bridge @@ -52,6 +46,13 @@ parameters: netmask: ${_param:opnfv_net_private_mask} use_interfaces: - ${_param:tenant_interface} +{%- endif %} + external_interface: + enabled: true + type: eth + name: ${_param:external_interface} + mtu: ${_param:interface_mtu} + proto: manual br-floating: enabled: true type: ovs_bridge |