summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-02-05 12:13:09 +0000
committerGerrit Code Review <review@openstack.org>2019-02-05 12:13:09 +0000
commit5847b42828f1a2a44de032445d63ce855a2780bc (patch)
treee840e4688cc730e486acb09be0a2b81c8041813f
parent76769643caea68091a63f77ee1269dce91108b14 (diff)
parent637a7a6ee26d5280e6504db62c69ffc38ed3a046 (diff)
Merge "Switch the default Neutron ML2 driver to OVN"
-rw-r--r--README.md2
-rw-r--r--packstack/plugins/neutron_350.py12
-rw-r--r--releasenotes/notes/switch-default-neutron-driver-to-ovn-0eb7053b81c7794d.yaml11
-rwxr-xr-xtests/scenario001.sh3
-rwxr-xr-xtests/scenario002.sh3
5 files changed, 23 insertions, 8 deletions
diff --git a/README.md b/README.md
index 2fc7e7d..e130c36 100644
--- a/README.md
+++ b/README.md
@@ -178,7 +178,7 @@ the current matrix of available tests:
178| glance | | file | swift | file | 178| glance | | file | swift | file |
179| nova | X | X | X | X | 179| nova | X | X | X | X |
180| neutron | X | X | X | X | 180| neutron | X | X | X | X |
181| neutron plugin | ovs | ovn | ovs | ovs | 181| neutron plugin | ovn | ovn | ovs | ovn |
182| lbaasv2 | | | X | | 182| lbaasv2 | | | X | |
183| vpnaas | | | | | 183| vpnaas | | | | |
184| cinder | X | X | | | 184| cinder | X | X | | |
diff --git a/packstack/plugins/neutron_350.py b/packstack/plugins/neutron_350.py
index d8673d9..237aae1 100644
--- a/packstack/plugins/neutron_350.py
+++ b/packstack/plugins/neutron_350.py
@@ -343,7 +343,7 @@ def initConfig(controller):
343 "entrypoints"), 343 "entrypoints"),
344 "OPTION_LIST": ["local", "flat", "vlan", "gre", "vxlan", "geneve"], 344 "OPTION_LIST": ["local", "flat", "vlan", "gre", "vxlan", "geneve"],
345 "VALIDATORS": [validators.validate_multi_options], 345 "VALIDATORS": [validators.validate_multi_options],
346 "DEFAULT_VALUE": "vxlan,flat", 346 "DEFAULT_VALUE": "geneve,flat",
347 "MASK_INPUT": False, 347 "MASK_INPUT": False,
348 "LOOSE_VALIDATION": False, 348 "LOOSE_VALIDATION": False,
349 "USE_DEFAULT": False, 349 "USE_DEFAULT": False,
@@ -356,7 +356,7 @@ def initConfig(controller):
356 "network_types to allocate as tenant networks"), 356 "network_types to allocate as tenant networks"),
357 "OPTION_LIST": ["local", "vlan", "gre", "vxlan", "geneve"], 357 "OPTION_LIST": ["local", "vlan", "gre", "vxlan", "geneve"],
358 "VALIDATORS": [validators.validate_multi_options], 358 "VALIDATORS": [validators.validate_multi_options],
359 "DEFAULT_VALUE": "vxlan", 359 "DEFAULT_VALUE": "geneve",
360 "MASK_INPUT": False, 360 "MASK_INPUT": False,
361 "LOOSE_VALIDATION": False, 361 "LOOSE_VALIDATION": False,
362 "USE_DEFAULT": False, 362 "USE_DEFAULT": False,
@@ -371,7 +371,7 @@ def initConfig(controller):
371 "hyperv", "ncs", "arista", "cisco_nexus", 371 "hyperv", "ncs", "arista", "cisco_nexus",
372 "mlnx", "l2population", "sriovnicswitch", "ovn"], 372 "mlnx", "l2population", "sriovnicswitch", "ovn"],
373 "VALIDATORS": [validators.validate_multi_options], 373 "VALIDATORS": [validators.validate_multi_options],
374 "DEFAULT_VALUE": "openvswitch", 374 "DEFAULT_VALUE": "ovn",
375 "MASK_INPUT": False, 375 "MASK_INPUT": False,
376 "LOOSE_VALIDATION": False, 376 "LOOSE_VALIDATION": False,
377 "USE_DEFAULT": False, 377 "USE_DEFAULT": False,
@@ -450,7 +450,7 @@ def initConfig(controller):
450 "with Neutron"), 450 "with Neutron"),
451 "OPTION_LIST": ["linuxbridge", "openvswitch", "ovn"], 451 "OPTION_LIST": ["linuxbridge", "openvswitch", "ovn"],
452 "VALIDATORS": [validators.validate_options], 452 "VALIDATORS": [validators.validate_options],
453 "DEFAULT_VALUE": "openvswitch", 453 "DEFAULT_VALUE": "ovn",
454 "MASK_INPUT": False, 454 "MASK_INPUT": False,
455 "LOOSE_VALIDATION": False, 455 "LOOSE_VALIDATION": False,
456 "CONF_NAME": "CONFIG_NEUTRON_L2_AGENT", 456 "CONF_NAME": "CONFIG_NEUTRON_L2_AGENT",
@@ -588,6 +588,10 @@ def initSequences(controller):
588 ovs_external = 'CONFIG_NEUTRON_OVS_EXTERNAL_PHYSNET' 588 ovs_external = 'CONFIG_NEUTRON_OVS_EXTERNAL_PHYSNET'
589 ovn_external = 'CONFIG_NEUTRON_OVN_EXTERNAL_PHYSNET' 589 ovn_external = 'CONFIG_NEUTRON_OVN_EXTERNAL_PHYSNET'
590 config[ovs_external] = config[ovn_external] 590 config[ovs_external] = config[ovn_external]
591 elif use_ml2_with_ovs(config):
592 if ('openvswitch' not in config[
593 'CONFIG_NEUTRON_ML2_MECHANISM_DRIVERS']):
594 config['CONFIG_NEUTRON_ML2_MECHANISM_DRIVERS'] = 'openvswitch'
591 595
592 plugin_db = 'neutron' 596 plugin_db = 'neutron'
593 plugin_path = 'neutron.plugins.ml2.plugin.Ml2Plugin' 597 plugin_path = 'neutron.plugins.ml2.plugin.Ml2Plugin'
diff --git a/releasenotes/notes/switch-default-neutron-driver-to-ovn-0eb7053b81c7794d.yaml b/releasenotes/notes/switch-default-neutron-driver-to-ovn-0eb7053b81c7794d.yaml
new file mode 100644
index 0000000..e6f7be7
--- /dev/null
+++ b/releasenotes/notes/switch-default-neutron-driver-to-ovn-0eb7053b81c7794d.yaml
@@ -0,0 +1,11 @@
1---
2prelude: >
3 The default ML2 driver is replaced from ``openvswitch``to ``ovn``. This
4 means that, when deploying packstack with the default settings, OVN will
5 be used as the networking backend for Neutron.
6features:
7 - |
8 OVN is now used as the default networking backend for Neutron when
9 deploying packstack. Neutron agents such as L2, L3 or DHCP agents are no
10 longer used and get replaced by OVN services.
11 The encapsulation used will be ``geneve`` instead of ``vxlan``.
diff --git a/tests/scenario001.sh b/tests/scenario001.sh
index 1a20935..3a5b834 100755
--- a/tests/scenario001.sh
+++ b/tests/scenario001.sh
@@ -36,9 +36,6 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
36 --os-horizon-ssl=y \ 36 --os-horizon-ssl=y \
37 --amqp-enable-ssl=y \ 37 --amqp-enable-ssl=y \
38 --glance-backend=file \ 38 --glance-backend=file \
39 --os-neutron-l2-agent=ovn \
40 --os-neutron-ml2-type-drivers="geneve,flat" \
41 --os-neutron-ml2-tenant-network-types="geneve" \
42 --provision-uec-kernel-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-vmlinuz" \ 39 --provision-uec-kernel-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-vmlinuz" \
43 --provision-uec-ramdisk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-initrd" \ 40 --provision-uec-ramdisk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-initrd" \
44 --provision-uec-disk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img" \ 41 --provision-uec-disk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img" \
diff --git a/tests/scenario002.sh b/tests/scenario002.sh
index b6a81e1..bca3d9f 100755
--- a/tests/scenario002.sh
+++ b/tests/scenario002.sh
@@ -36,6 +36,9 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
36 --os-cinder-install=n \ 36 --os-cinder-install=n \
37 --os-horizon-install=n \ 37 --os-horizon-install=n \
38 --glance-backend=swift \ 38 --glance-backend=swift \
39 --os-neutron-l2-agent=openvswitch \
40 --os-neutron-ml2-type-drivers="vxlan,flat" \
41 --os-neutron-ml2-tenant-network-types="vxlan" \
39 --os-neutron-lbaas-install=y \ 42 --os-neutron-lbaas-install=y \
40 --os-neutron-vpnaas-install=n \ 43 --os-neutron-vpnaas-install=n \
41 --os-sahara-install=y \ 44 --os-sahara-install=y \