diff options
Diffstat (limited to 'mcp/reclass/classes')
15 files changed, 27 insertions, 16 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' }} diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm_pdf.yml.j2 index 6754d13dd..484e53299 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm_pdf.yml.j2 @@ -13,8 +13,6 @@ {%- set vlans = { nm.vlan_admin: nm.ctl01.nic_admin, nm.vlan_mgmt: nm.ctl01.nic_mgmt, nm.vlan_public: nm.ctl01.nic_public } %} --- parameters: - _param: - interface_mtu: 1500 linux: network: interface: diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml index b9bf6aac6..c4b862bc8 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml @@ -33,7 +33,6 @@ parameters: cluster_node03_hostname: ${_param:openstack_control_node03_hostname} cluster_node03_address: ${_param:openstack_control_node03_address} nova_vncproxy_url: https://${_param:cluster_public_host}:6080 - interface_mtu: 1500 keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 linux_system_codename: xenial diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 index 3e33811a9..f1b369c66 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 @@ -75,3 +75,4 @@ parameters: type: ovs_port ovs_bridge: br-floating bridge: br-floating + mtu: ${_param:interface_mtu} diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 index edb20e3b6..41625e8ff 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 @@ -87,6 +87,9 @@ parameters: <<: *db_conn_recycle_time vlan_aware_vms: true root_helper_daemon: false + global_physnet_mtu: ${_param:interface_mtu} + backend: + external_mtu: ${_param:interface_mtu} keystone: server: <<: *db_conn_recycle_time diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_biport.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_biport.yml.j2 index cb4c233cd..3b302aca8 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_biport.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_biport.yml.j2 @@ -29,6 +29,7 @@ parameters: name_servers: - {{ nm.net_admin_gw }} noifupdown: true + mtu: ${_param:interface_mtu} single: enabled: true type: eth @@ -36,4 +37,5 @@ parameters: name: ${_param:single_nic} address: ${_param:single_address} netmask: ${_param:opnfv_net_public_mask} + mtu: ${_param:interface_mtu} {%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_triport.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_triport.yml.j2 index 38a436138..8815de99b 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_triport.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_triport.yml.j2 @@ -28,6 +28,7 @@ parameters: address: ${_param:pxe_admin_address} netmask: ${_param:opnfv_net_admin_mask} noifupdown: true + mtu: ${_param:interface_mtu} single_int: enabled: true type: eth @@ -37,6 +38,7 @@ parameters: netmask: ${_param:opnfv_net_public_mask} gateway: ${_param:opnfv_net_public_gw} name_servers: {{ nm.dns_public }} + mtu: ${_param:interface_mtu} control_int: enabled: true type: eth @@ -44,6 +46,7 @@ parameters: name: ${_param:control_nic} address: ${_param:control_address} netmask: ${_param:opnfv_net_mgmt_mask} + mtu: ${_param:interface_mtu} {%- else %} {#- For NOVCP scenarios, base config is in kvm_pdf, only add/override gw #} parameters: diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml index efdc2ffb1..5b68f7d92 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml @@ -21,7 +21,6 @@ classes: - cluster.mcp-common-noha.openstack_compute_pdf parameters: _param: - interface_mtu: 9000 linux_system_codename: xenial nova: compute: diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 index 2891664d3..62873ebf7 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 @@ -72,7 +72,6 @@ classes: - cluster.mcp-common-noha.openstack_control_pdf parameters: _param: - interface_mtu: 9000 linux_system_codename: xenial ceilometer_create_gnocchi_resources: 'True' barbican_integration_enabled: 'false' @@ -185,9 +184,9 @@ parameters: server: vlan_aware_vms: true root_helper_daemon: false - global_physnet_mtu: 9000 + global_physnet_mtu: ${_param:interface_mtu} backend: - external_mtu: 9000 + external_mtu: ${_param:interface_mtu} {%- if '-bgpvpn-' in conf.MCP_DEPLOY_SCENARIO %} bgp_vpn: enabled: True diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control_pdf.yml.j2 index 7a1c3532d..06df3b845 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control_pdf.yml.j2 @@ -22,6 +22,7 @@ parameters: type: eth address: ${_param:pxe_admin_address} netmask: ${_param:opnfv_net_admin_mask} + mtu: ${_param:interface_mtu} noifupdown: true {#- prevent duplicates for tagged mgmt on the same physical interface as PXE/admin #} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml index 0062adf16..f29cb867c 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml @@ -11,7 +11,6 @@ classes: - cluster.mcp-common-noha.openstack_gateway_pdf parameters: _param: - interface_mtu: 9000 linux_system_codename: xenial neutron: gateway: diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 index 92abf9d8f..135b82d23 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 @@ -15,7 +15,6 @@ classes: - cluster.mcp-odl-noha.opendaylight.control_pdf parameters: _param: - interface_mtu: 1500 linux_system_codename: xenial opendaylight: server: diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 index 95f3ee385..b21131dfe 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 @@ -10,6 +10,10 @@ {#- Filter-out NIC duplicates by constructing a dict (used NICs only) #} {%- set nics = { nm.ctl01.nic_mgmt: True } %} {%- set vlans = { nm.vlan_mgmt: nm.ctl01.nic_mgmt } %} +{%- if '-bgpvpn-' in conf.MCP_DEPLOY_SCENARIO %} + {%- do nics.update({nm.ctl01.nic_public: True}) %} + {%- do vlans.update({nm.vlan_public: nm.ctl01.nic_public}) %} +{%- endif %} --- parameters: linux: @@ -28,14 +32,15 @@ parameters: name_servers: - {{ nm.net_admin_gw }} {%- if '-bgpvpn-' in conf.MCP_DEPLOY_SCENARIO %} - external: + br-ext: enabled: true - name: {{ nm.ctl01.nic_public }} + type: bridge proto: static - type: eth address: ${_param:opnfv_opendaylight_server_external_address} netmask: ${_param:opnfv_net_public_mask} mtu: ${_param:interface_mtu} + use_interfaces: + - {{ ma.interface_str(nm.ctl01.nic_public, nm.vlan_public) }} noifupdown: true {%- endif %} 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 d57a4b7c1..3e912c1e3 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 @@ -53,6 +53,7 @@ parameters: type: ovs_port mtu: ${_param:interface_mtu} bridge: br-floating + noifupdown: true br-ex: enabled: true type: bridge @@ -64,6 +65,7 @@ parameters: - float-to-ex gateway: ${_param:opnfv_net_public_gw} name_servers: {{ nm.dns_public }} + noifupdown: true {%- else %} br-mesh: enabled: true |