Merge "If auth parameter is missing or not set to 'keystone', turn of…

…f keystone authentication"

src/config/api-server/tests/test_rbac.py

@@ -370,6 +370,34 @@ def tearDown(self):
         super(TestRbacAaaModeInvalid, self).tearDown()
     # end tearDown
 
+class TestAuthModeInvalid(test_case.ApiServerTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.console_handler = logging.StreamHandler()
+        cls.console_handler.setLevel(logging.DEBUG)
+        logger.addHandler(cls.console_handler)
+        extra_config_knobs = [
+            ('DEFAULTS', 'auth', 'no-auth'),
+        ]
+        super(TestAuthModeInvalid, cls).setUpClass(extra_config_knobs=extra_config_knobs)
+
+    @classmethod
+    def tearDownClass(cls, *args, **kwargs):
+        logger.removeHandler(cls.console_handler)
+        super(TestAuthModeInvalid, cls).tearDownClass(*args, **kwargs)
+
+    def setUp(self):
+        super(TestAuthModeInvalid, self).setUp()
+
+    def test_aaa_mode(self):
+        rv = self._api_server.is_auth_disabled()
+        self.assertEquals(rv, True)
+
+    def tearDown(self):
+        super(TestAuthModeInvalid, self).tearDown()
+    # end tearDown
+
 class TestRbac(test_case.ApiServerTestCase):
 
     @classmethod

src/config/api-server/vnc_cfg_api_server.py

@@ -1766,7 +1766,7 @@ def get_rabbit_health_check_interval(self):
     # end get_rabbit_health_check_interval
 
     def is_auth_disabled(self):
-        return self._args.auth is None
+        return self._args.auth is None or self._args.auth.lower() != 'keystone'
 
     def is_admin_request(self):
         if not self.is_multi_tenancy_set():