diff --git a/murano/common/config.py b/murano/common/config.py index ee8ce4b3..72dbdd8d 100644 --- a/murano/common/config.py +++ b/murano/common/config.py @@ -201,7 +201,11 @@ networking_opts = [ cfg.StrOpt('network_config_file', default='netconfig.yaml', help='If provided networking configuration will be taken ' - 'from this file') + 'from this file'), + + cfg.StrOpt('driver', default=None, choices=['neutron', 'nova'], + help='Network driver to use. Options are neutron or nova.' + 'If not provided, the driver will be detected.'), ] stats_opts = [ diff --git a/murano/db/services/environments.py b/murano/db/services/environments.py index 28ec49d1..9ca062e6 100644 --- a/murano/db/services/environments.py +++ b/murano/db/services/environments.py @@ -264,6 +264,11 @@ class EnvironmentServices(object): @staticmethod def get_network_driver(context): + driver = CONF.networking.driver + if driver: + LOG.debug("Will use {} as a network driver".format(driver)) + return driver + session = auth_utils.get_token_client_session( context.auth_token, context.tenant) try: diff --git a/releasenotes/notes/config-network-driver-77c82d151dead620.yaml b/releasenotes/notes/config-network-driver-77c82d151dead620.yaml new file mode 100644 index 00000000..7b4c1e0c --- /dev/null +++ b/releasenotes/notes/config-network-driver-77c82d151dead620.yaml @@ -0,0 +1,4 @@ +--- +features: + - Configuration option added to explicitly select a + networking driver rather than auto-detect.