openstack
/
monasca-kibana-plugin
Code Issues Proposed changes

Do not validate SSL cert in Keystone health check 

This commit turns off SSL certificate validation for the
Keystone Health check.

Change-Id: I42bdc18a4668baf48ac26614b5301cb10cdd71fa
Story: 2001093
Task: 4754
This commit is contained in:
Johannes Grassler 2017-06-29 17:06:34 +02:00
parent 954871e5a4
commit 6d9a227816
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/healthcheck/index.js
View File

@ -21,6 +21,7 @@ module.exports = function healthcheck(plugin, server) {
const config = server.config(); const config = server.config();
const keystoneUrl = util.keystoneUrl(config); const keystoneUrl = util.keystoneUrl(config);
const request = getRequest(); const request = getRequest();
const requestParams = getRequestParams();
server.log(['keystone', 'healthcheck', 'debug'], `keystone url is ${keystoneUrl}`); server.log(['keystone', 'healthcheck', 'debug'], `keystone url is ${keystoneUrl}`);
@ -41,11 +42,8 @@ module.exports = function healthcheck(plugin, server) {
function check() { function check() {
return new Promise((resolve, reject)=> { return new Promise((resolve, reject)=> {
const req = request({ const req = request(
hostname: getHostname(), requestParams, (res)=> {
port : getPort(),
method : 'GET'
}, (res)=> {
const statusCode = res.statusCode; const statusCode = res.statusCode;
if (statusCode >= 400) { if (statusCode >= 400) {
plugin.status.red('Unavailable'); plugin.status.red('Unavailable');
@ -115,4 +113,19 @@ module.exports = function healthcheck(plugin, server) {
return required.request; return required.request;
} }
function getRequestParams() {
let params;
params = {
hostname: getHostname(),
port : getPort(),
method : 'GET'
};
if (util.startsWith(keystoneUrl, 'https')) {
params.rejectUnauthorized = false;
}
return params;
}
}; };