diff --git a/releasenotes/notes/enable-neutron-by-default-57b87a20acc1ac47.yaml b/releasenotes/notes/enable-neutron-by-default-57b87a20acc1ac47.yaml new file mode 100644 index 0000000000..b8722ea487 --- /dev/null +++ b/releasenotes/notes/enable-neutron-by-default-57b87a20acc1ac47.yaml @@ -0,0 +1,9 @@ +--- +upgrade: + - | + Default value of the ``[service_available] neutron`` option has been + updated from ``False`` to ``True``. + + - | + All tests which require network features are now skipped when + the ``[service_available] neutron`` option is set to ``False`` diff --git a/tempest/common/utils/__init__.py b/tempest/common/utils/__init__.py index 0fa5ce42fb..0c510de644 100644 --- a/tempest/common/utils/__init__.py +++ b/tempest/common/utils/__init__.py @@ -29,12 +29,7 @@ def get_service_list(): 'compute': CONF.service_available.nova, 'image': CONF.service_available.glance, 'volume': CONF.service_available.cinder, - # NOTE(masayukig): We have two network services which are neutron and - # nova-network. And we have no way to know whether nova-network is - # available or not. After the pending removal of nova-network from - # nova, we can treat the network/neutron case in the same manner as - # the other services. - 'network': True, + 'network': CONF.service_available.neutron, # NOTE(masayukig): Tempest tests always require the identity service. # So we should set this True here. 'identity': True, diff --git a/tempest/config.py b/tempest/config.py index 0a084eaf1f..2584c679b1 100644 --- a/tempest/config.py +++ b/tempest/config.py @@ -1196,7 +1196,7 @@ ServiceAvailableGroup = [ default=True, help="Whether or not cinder is expected to be available"), cfg.BoolOpt('neutron', - default=False, + default=True, help="Whether or not neutron is expected to be available"), cfg.BoolOpt('glance', default=True,