diff options
| author | Bence Romsics <bence.romsics@gmail.com> | 2020-02-18 15:27:58 +0100 |
|---|---|---|
| committer | Bence Romsics <bence.romsics@gmail.com> | 2020-03-03 14:43:01 +0100 |
| commit | 6b01ecf9ea393f89d5ee9b41f534fb785aa22450 (patch) | |
| tree | 7b4f9a7b96d3a59c758ae97e9cca208e16daa709 /devstack/lib | |
| parent | 02a7e9674337d622c3cbcc9b82c7c9b417576a87 (diff) | |
| download | neutron-6b01ecf9ea393f89d5ee9b41f534fb785aa22450.tar.gz | |
Limit ovn sanity checks to q-svc
The sanity checks related to neutron-server config only make sense
when q-svc service is enabled. When building a devstack without q-svc
(for example a compute-only devstack) do not force this configuration
to be present where it's meaningless.
Change-Id: I5b9176d4a55a826f498e367f1f02569429dbe546
Diffstat (limited to 'devstack/lib')
| -rw-r--r-- | devstack/lib/ovn_agent | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/devstack/lib/ovn_agent b/devstack/lib/ovn_agent index d0c51beda6..9cf063c4ea 100644 --- a/devstack/lib/ovn_agent +++ b/devstack/lib/ovn_agent @@ -416,9 +416,9 @@ function ovn_sanity_check { die $LINENO "The q-agt/neutron-agt service must be disabled with OVN." elif is_service_enabled q-l3 neutron-l3; then die $LINENO "The q-l3/neutron-l3 service must be disabled with OVN." - elif [[ ! $Q_ML2_PLUGIN_MECHANISM_DRIVERS =~ "ovn" ]]; then + elif is_service_enabled q-svc neutron-api && [[ ! $Q_ML2_PLUGIN_MECHANISM_DRIVERS =~ "ovn" ]]; then die $LINENO "OVN needs to be enabled in \$Q_ML2_PLUGIN_MECHANISM_DRIVERS" - elif [[ ! $Q_ML2_PLUGIN_TYPE_DRIVERS =~ "geneve" ]]; then + elif is_service_enabled q-svc neutron-api && [[ ! $Q_ML2_PLUGIN_TYPE_DRIVERS =~ "geneve" ]]; then die $LINENO "Geneve needs to be enabled in \$Q_ML2_PLUGIN_TYPE_DRIVERS to be used with OVN" fi } |