7:38 a.m.
This information is related to Wok configuration.
Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com>
---
docs/API.md | 1 -
model/config.py | 1 -
tests/test_rest.py | 2 +-
ui/js/src/kimchi.guest_edit_main.js | 6 +++---
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/docs/API.md b/docs/API.md
index 01ee432..1b01a6e 100644
--- a/docs/API.md
+++ b/docs/API.md
@@ -729,7 +729,6 @@ creation.
* repo_mngt_tool: 'deb', 'yum' or None - when the repository
management
tool is not identified
* federation: 'on' if federation feature is enabled, 'off'
otherwise.
- * auth: authentication type, 'pam' and 'ldap' are supported.
* **POST**: *See Configuration Actions*
**Actions (POST):**
diff --git a/model/config.py b/model/config.py
index 588ad54..da5248c 100644
--- a/model/config.py
+++ b/model/config.py
@@ -118,7 +118,6 @@ class CapabilitiesModel(object):
'qemu_stream': self.qemu_stream,
'screenshot': VMScreenshot.get_stream_test_result(),
'federation': kconfig.get("server",
"federation"),
- 'auth': kconfig.get("authentication",
"method"),
'kernel_vfio': self.kernel_vfio,
'nm_running': FeatureTests.is_nm_running(),
'mem_hotplug_support': self.mem_hotplug_support
diff --git a/tests/test_rest.py b/tests/test_rest.py
index 2115e33..9fa3795 100644
--- a/tests/test_rest.py
+++ b/tests/test_rest.py
@@ -1234,7 +1234,7 @@ class RestTests(unittest.TestCase):
conf = json.loads(resp)
keys = [u'libvirt_stream_protocols', u'qemu_stream',
u'qemu_spice',
- u'screenshot', u'federation', u'kernel_vfio',
u'auth',
+ u'screenshot', u'kernel_vfio', u'federation',
u'nm_running', u'mem_hotplug_support']
self.assertEquals(sorted(keys), sorted(conf.keys()))
diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js
index 3f9c3e9..7716f21 100644
--- a/ui/js/src/kimchi.guest_edit_main.js
+++ b/ui/js/src/kimchi.guest_edit_main.js
@@ -1,7 +1,7 @@
/*
* Project Kimchi
*
- * Copyright IBM, Corp. 2013-2015
+ * Copyright IBM, Corp. 2013-2016
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -309,7 +309,7 @@ kimchi.guest_edit_main = function() {
//set up for PAM
var userNodes = {},
groupNodes = {};
- authType = kimchi.capabilities['auth'];
+ authType = wok.config['auth'];
if (authType === 'pam') {
$("#form-guest-edit-permission .ldap").hide();
kimchi.retrieveVM(kimchi.selectedGuest, function(vm) {
@@ -725,7 +725,7 @@ kimchi.guest_edit_main = function() {
users: [],
groups: []
};
- authType = kimchi.capabilities['auth'];
+ authType = wok.config['auth'];
if (authType === 'pam') {
$("#permission-sel-users").children().each(function() {
content.users.push($("label", this).text());
--
2.5.0