From 66ab1e5184cc09e5c51e41088318d7db83ba30fe Mon Sep 17 00:00:00 2001 From: CEG Date: Tue, 23 May 2017 20:06:05 -0600 Subject: [PATCH] Re-adding neutron dependency check --- salt/utils/openstack/neutron.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/salt/utils/openstack/neutron.py b/salt/utils/openstack/neutron.py index 5988d1f9d7..f7ca2e6976 100644 --- a/salt/utils/openstack/neutron.py +++ b/salt/utils/openstack/neutron.py @@ -80,7 +80,10 @@ class SaltNeutron(NeutronShell): ''' Set up neutron credentials ''' - if all([use_keystoneauth, HAS_KEYSTONEAUTH]): + if not HAS_NEUTRON: + return None + + elif all([use_keystoneauth, HAS_KEYSTONEAUTH]): self._new_init(username=username, project_name=tenant_name, auth_url=auth_url,