xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-09-29 00:31:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into discovery

Browse Source
This commit is contained in:
Jarrod Johnson
2016-11-09 10:40:06 -05:00
parent a1757571b4 70762d3f6c
commit 63431deffb
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
confluent_client/bin/nodesetboot
+1 -2
View File
@@ -55,7 +55,6 @@ if options.biosmode:
bootmode = 'bios'
else:
bootmode = 'uefi'
sys.exit(
session.simple_noderange_command(noderange, '/boot/nextdevice', bootdev,
sys.exit(session.simple_noderange_command(noderange, '/boot/nextdevice', bootdev,
bootmode=bootmode,
persistent=options.persist))
confluent_client/doc/man/nodesensors.ronn
+16 -16
View File
@@ -30,7 +30,7 @@ interval of 1 second is used.
otherwise indicated.
## EXAMPLES
* Retrieving all temperature related sensors from one system
* Retrieving all temperature related sensors from one system
`# nodesensors n1 temperature`
`n1: CPU 1 Overtemp: Ok`
`n1: CPU 2 Overtemp: Ok`
@@ -38,18 +38,18 @@ interval of 1 second is used.
`n1: PCH Overtemp: Ok`
`n1: LOM Temp: Ok`
* Retrieving a sensor named "Inlet Temp" for 4 systems over a 3 second period of time:
'nodesensors n1-n4 'Inlet Temp' -c -n 3
'time,node,Inlet Temp (°C)`
'2016-10-04T15:09:20,n1,19.0`
'2016-10-04T15:09:20,n2,18.0`
'2016-10-04T15:09:20,n3,18.0`
'2016-10-04T15:09:20,n4,17.0`
'2016-10-04T15:09:21,n1,19.0`
'2016-10-04T15:09:21,n2,18.0`
'2016-10-04T15:09:21,n3,18.0`
'2016-10-04T15:09:21,n4,17.0`
'2016-10-04T15:09:22,n1,19.0`
'2016-10-04T15:09:22,n2,18.0`
'2016-10-04T15:09:22,n3,18.0`
'2016-10-04T15:09:22,n4,17.0`
* Retrieving a sensor named "Inlet Temp" for 4 systems over a 3 second period of time:
`# nodesensors n1-n4 'Inlet Temp' -c -n 3`
`time,node,Inlet Temp (°C)`
`2016-10-04T15:09:20,n1,19.0`
`2016-10-04T15:09:20,n2,18.0`
`2016-10-04T15:09:20,n3,18.0`
`2016-10-04T15:09:20,n4,17.0`
`2016-10-04T15:09:21,n1,19.0`
`2016-10-04T15:09:21,n2,18.0`
`2016-10-04T15:09:21,n3,18.0`
`2016-10-04T15:09:21,n4,17.0`
`2016-10-04T15:09:22,n1,19.0`
`2016-10-04T15:09:22,n2,18.0`
`2016-10-04T15:09:22,n3,18.0`
`2016-10-04T15:09:22,n4,17.0`
confluent_server/confluent/httpapi.py
+3 -2
View File
@@ -290,6 +290,7 @@ def _authorize_request(env, operation):
cookie['confluentsessionid'] = sessid
cookie['confluentsessionid']['secure'] = 1
cookie['confluentsessionid']['httponly'] = 1
cookie['confluentsessionid']['path'] = '/'
skiplog = _should_skip_authlog(env)
if authdata:
auditmsg = {
@@ -306,8 +307,8 @@ def _authorize_request(env, operation):
auditmsg['tenant'] = authdata[3]
authinfo['tenant'] = authdata[3]
auditmsg['user'] = authdata[2]
if sessionid is not None:
authinfo['sessionid'] = sessionid
if sessid is not None:
authinfo['sessionid'] = sessid
if not skiplog:
auditlog.log(auditmsg)
if 'csrftoken' in httpsessions[sessid]:
confluent_server/confluent_server.spec.tmpl
+1 -1
View File
@@ -12,7 +12,7 @@ Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Prefix: %{_prefix}
BuildArch: noarch
Requires: python-pyghmi, python-eventlet, python-greenlet, python-crypto >= 2.6.1, confluent_client, pyparsing, python-paramiko, python-dnspython
Requires: python-pyghmi, python-eventlet, python-greenlet, python-crypto >= 2.6.1, confluent_client, pyparsing, python-paramiko, python-dns
Vendor: Jarrod Johnson <jjohnson2@lenovo.com>
Url: http://xcat.sf.net/