diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-12-12 19:44:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-12-12 19:44:34 +0000 |
| commit | 77a990e3bf3585cdf4587ce9658bb50f9b50c7d2 (patch) | |
| tree | 0c175de20744bde30b35bd5007b4044302f94e49 /mcp/reclass/classes/cluster/all-mcp-arch-common | |
| parent | 3633ccf6b4fa39e3cef23bf4690073786e133044 (diff) | |
| parent | e2c175f3114fb1857ab8ab4bb7e8ff2f8daf18bd (diff) | |
Merge "Make MTU cluster-level configurable via IDF"
Diffstat (limited to 'mcp/reclass/classes/cluster/all-mcp-arch-common')
| -rw-r--r-- | mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 | 7 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 index fb45b13fe..40a14c4a6 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 @@ -19,9 +19,6 @@ parameters: mcpcontrol_interface: ${_param:opnfv_fn_vm_primary_interface} primary_interface: ${_param:opnfv_fn_vm_secondary_interface} pxe_admin_interface: ${_param:opnfv_fn_vm_tertiary_interface} - interface_mtu: 1500 - # MaaS has issues using MTU > 1500 for PXE interface - pxe_admin_interface_mtu: 1500 linux_system_codename: xenial maas_admin_username: opnfv dns_server01: '{{ nm.dns_public[0] }}' @@ -113,6 +110,7 @@ parameters: name: ${_param:mcpcontrol_interface} type: eth proto: dhcp + mtu: ${_param:interface_mtu} primary_interface: enabled: true name: ${_param:primary_interface} @@ -134,7 +132,8 @@ parameters: pxe_admin_interface: enabled: true name: ${_param:pxe_admin_interface} - mtu: ${_param:pxe_admin_interface_mtu} + # MaaS has issues using MTU > 1500 for PXE interface + mtu: 1500 proto: static address: ${_param:single_address} netmask: ${_param:opnfv_net_admin_mask} diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 index 84c82b738..dfa1d89cc 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 @@ -45,6 +45,8 @@ parameters: opnfv_vcp_vm_tertiary_interface: ens4 {%- endif %} + interface_mtu: {{ conf.idf.fuel.network.interface_mtu or 1500 }} + ntp_strata_host1: {{ conf.idf.fuel.network.ntp_strata_host1 or '1.pool.ntp.org' }} ntp_strata_host2: {{ conf.idf.fuel.network.ntp_strata_host2 or '0.pool.ntp.org' }} |