From f0fb32c0f0455f739df7b8878a0f9cf5f262d2b1 Mon Sep 17 00:00:00 2001 From: Ronelle Landy Date: Mon, 11 Dec 2017 16:39:41 -0500 Subject: [PATCH] ADD MTU settings and Neutron settings adjustment This review moved MTU settings to the testenv files and adds settings to adjust the Neutron settings accordingly on the undercloud and overcloud. Depends-On: I3106137cdb216ba593e4788f2a7f319669c8081c Change-Id: I10a2a8df25e3110b6584b47dca693c19abeb4930 --- toci-quickstart/config/testenv/multinode-rdocloud.yml | 6 +++++- toci-quickstart/config/testenv/multinode.yml | 5 +++++ toci-quickstart/config/testenv/ovb.yml | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/toci-quickstart/config/testenv/multinode-rdocloud.yml b/toci-quickstart/config/testenv/multinode-rdocloud.yml index 716ba2504..67f4d2fa5 100644 --- a/toci-quickstart/config/testenv/multinode-rdocloud.yml +++ b/toci-quickstart/config/testenv/multinode-rdocloud.yml @@ -19,6 +19,10 @@ toci_vxlan_networking_multinode: true vxlan_mtu: 1350 hostname_correction: true # workaround restriction on toci images +mtu: "{{ vxlan_mtu }}" +undercloud_local_mtu: "{{ mtu }}" +overcloud_neutron_global_physnet_mtu: "{{ mtu }}" + ceph_use_fqdn: true # environment settings, not TRIPLEO-CI specific @@ -47,4 +51,4 @@ ara_graphite_prefix: "test.tripleo.{{ lookup('env', 'STABLE_RELEASE')|default('m ara_graphite_server: 66.187.229.172 #build-test packages -artg_repos_dir: "{{ tripleo_root }}" \ No newline at end of file +artg_repos_dir: "{{ tripleo_root }}" diff --git a/toci-quickstart/config/testenv/multinode.yml b/toci-quickstart/config/testenv/multinode.yml index 1c28091b0..7c6487ce2 100644 --- a/toci-quickstart/config/testenv/multinode.yml +++ b/toci-quickstart/config/testenv/multinode.yml @@ -14,6 +14,11 @@ dlrn_use_local_mirrors: true vxlan_networking: true hostname_correction: true # workaround restriction on toci images +vxlan_mtu: 1350 +mtu: "{{ vxlan_mtu }}" +undercloud_local_mtu: "{{ mtu }}" +overcloud_neutron_global_physnet_mtu: "{{ mtu }}" + # environment settings, not TRIPLEO-CI specific undercloud_local_interface: "br-ex" # related to osinfra network configuration flavor_args: "" diff --git a/toci-quickstart/config/testenv/ovb.yml b/toci-quickstart/config/testenv/ovb.yml index da745bb81..c6b7909ef 100644 --- a/toci-quickstart/config/testenv/ovb.yml +++ b/toci-quickstart/config/testenv/ovb.yml @@ -57,8 +57,8 @@ host_network_interfaces: - eth1 - "{% if network_isolation|default(true)|bool %}eth2{% endif %}" mtu_interface: "{{ host_network_interfaces|select()|list }}" -undercloud_local_mtu: 1350 -overcloud_neutron_global_physnet_mtu: 1350 +undercloud_local_mtu: "{{ mtu }}" +overcloud_neutron_global_physnet_mtu: "{{ mtu }}" floating_ip_cidr: >- {%- if network_isolation|default(true)|bool %}10.0.0.0/24 {%- else %}192.168.24.0/24