diff --git a/devstack/ml2-ovs-compute-local.conf.sample b/devstack/ml2-ovs-compute-local.conf.sample index 49db11bf6ad..6ab5f105ef5 100644 --- a/devstack/ml2-ovs-compute-local.conf.sample +++ b/devstack/ml2-ovs-compute-local.conf.sample @@ -45,7 +45,7 @@ ENABLED_SERVICES=n-cpu,n-novnc,neutron,q-agt,q-l3,q-meta,q-dhcp local_ip= [agent] -tunnel_types=vxlan +tunnel_types=vxlan,gre # You can add more config options here for neutron-openvswith-agent, for instance # you can uncomment the followings settings to enable related functions. #l2_population=True diff --git a/devstack/ml2-ovs-local.conf.sample b/devstack/ml2-ovs-local.conf.sample index 4c8eb0fd038..05256d2beb8 100644 --- a/devstack/ml2-ovs-local.conf.sample +++ b/devstack/ml2-ovs-local.conf.sample @@ -69,6 +69,9 @@ type_drivers=flat,gre,vlan,vxlan tenant_network_types=vxlan mechanism_drivers=openvswitch,l2population +[agent] +tunnel_types=vxlan,gre + # You can add more config options here for ml2_conf.ini, for instance # you can uncomment the followings to set the segment ID ranges for # various tenant network types. diff --git a/doc/source/contributor/testing/ml2_ovs_devstack.rst b/doc/source/contributor/testing/ml2_ovs_devstack.rst index 1b1ac51d4ea..1d8ccfe6fcb 100644 --- a/doc/source/contributor/testing/ml2_ovs_devstack.rst +++ b/doc/source/contributor/testing/ml2_ovs_devstack.rst @@ -26,7 +26,8 @@ to use either CentOS 8 or the latest Ubuntu LTS. :: - $ cp -r devstack /opt/stack + $ sudo cp -r devstack /opt/stack + $ sudo chown -R stack:stack /opt/stack/devstack $ sudo su - stack $ cd /opt/stack $ git clone https://opendev.org/openstack/neutron.git diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 969420bd9f4..201f496b160 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -13,6 +13,7 @@ run: playbooks/run_functional_job.yaml post-run: playbooks/post_functional_job.yaml irrelevant-files: &irrelevant-files + - ^.*\.conf\.sample$ - ^.*\.rst$ - ^doc/.*$ - ^neutron/locale/.*$ @@ -59,6 +60,7 @@ - ^releasenotes/.*$ - ^doc/.*$ - ^setup.cfg$ + - ^.*\.conf\.sample$ - ^.*\.rst$ - ^neutron/locale/.*$ - ^neutron/tests/unit/.*$ diff --git a/zuul.d/grenade.yaml b/zuul.d/grenade.yaml index 1d88076c6a8..3b48cb79be3 100644 --- a/zuul.d/grenade.yaml +++ b/zuul.d/grenade.yaml @@ -9,6 +9,7 @@ - ^releasenotes/.*$ - ^doc/.*$ - ^setup.cfg$ + - ^.*\.conf\.sample$ - ^.*\.rst$ - ^neutron/locale/.*$ - ^neutron/tests/.*$ @@ -158,6 +159,7 @@ - ^releasenotes/.*$ - ^doc/.*$ - ^setup.cfg$ + - ^.*\.conf\.sample$ - ^.*\.rst$ - ^neutron/locale/.*$ - ^neutron/tests/.*$ diff --git a/zuul.d/rally.yaml b/zuul.d/rally.yaml index e5df78c6784..0dba79ea853 100644 --- a/zuul.d/rally.yaml +++ b/zuul.d/rally.yaml @@ -56,6 +56,7 @@ - ^releasenotes/.*$ - ^doc/.*$ - ^setup.cfg$ + - ^.*\.conf\.sample$ - ^.*\.rst$ - ^neutron/locale/.*$ - ^neutron/tests/.*$ @@ -80,6 +81,7 @@ - ^releasenotes/.*$ - ^doc/.*$ - ^setup.cfg$ + - ^.*\.conf\.sample$ - ^.*\.rst$ - ^neutron/locale/.*$ - ^neutron/tests/.*$ diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index 36665d8d811..3cc97ee4257 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -13,6 +13,7 @@ - ^releasenotes/.*$ - ^doc/.*$ - ^setup.cfg$ + - ^.*\.conf\.sample$ - ^.*\.rst$ - ^neutron/locale/.*$ - ^neutron/tests/.*$ @@ -252,6 +253,7 @@ - ^releasenotes/.*$ - ^doc/.*$ - ^setup.cfg$ + - ^.*\.conf\.sample$ - ^.*\.rst$ - ^neutron/locale/.*$ - ^neutron/tests/.*$ diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index ea5ff1a604e..6778ace5002 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -55,6 +55,7 @@ Q_AGENT: openvswitch irrelevant-files: &openvswitch-irrelevant-files - ^(test-|)requirements.txt$ + - ^.*\.conf\.sample$ - ^.*\.rst$ - ^doc/.*$ - ^neutron/locale/.*$ @@ -95,6 +96,7 @@ Q_AGENT: linuxbridge irrelevant-files: - ^(test-|)requirements.txt$ + - ^.*\.conf\.sample$ - ^.*\.rst$ - ^doc/.*$ - ^neutron/locale/.*$ @@ -203,6 +205,7 @@ s-proxy: false irrelevant-files: &tempest-db-irrelevant-files - ^(test-|)requirements.txt$ + - ^.*\.conf\.sample$ - ^.*\.rst$ - ^doc/.*$ - ^neutron/locale/.*$ @@ -273,6 +276,7 @@ s-proxy: false irrelevant-files: - ^(test-|)requirements.txt$ + - ^.*\.conf\.sample$ - ^.*\.rst$ - ^doc/.*$ - ^neutron/locale/.*$ @@ -350,6 +354,7 @@ debug_iptables_rules: True irrelevant-files: &irrelevant-files - ^(test-|)requirements.txt$ + - ^.*\.conf\.sample$ - ^.*\.rst$ - ^doc/.*$ - ^neutron/locale/.*$ @@ -455,6 +460,7 @@ - ^releasenotes/.*$ - ^doc/.*$ - ^setup.cfg$ + - ^.*\.conf\.sample$ - ^.*\.rst$ - ^neutron/locale/.*$ - ^neutron/tests/unit/.*$ diff --git a/zuul.d/tripleo.yaml b/zuul.d/tripleo.yaml index e2717e5462d..efaa7d89bd7 100644 --- a/zuul.d/tripleo.yaml +++ b/zuul.d/tripleo.yaml @@ -22,6 +22,7 @@ - ^releasenotes/.*$ - ^doc/.*$ - ^setup.cfg$ + - ^.*\.conf\.sample$ - ^.*\.rst$ - ^neutron/locale/.*$ - ^neutron/tests/unit/.*$ @@ -47,6 +48,7 @@ - ^releasenotes/.*$ - ^doc/.*$ - ^setup.cfg$ + - ^.*\.conf\.sample$ - ^.*\.rst$ - ^neutron/locale/.*$ - ^neutron/tests/unit/.*$