Merge branch 'master' of http://git.quantgroup.cn/QA/qa-deploy-utils

qa_shell_script/config_server/get_project_config_server.js

@@ -2,6 +2,7 @@ var express = require('express');
 var cproc = require('child_process');
 var bodyParser = require('body-parser');
 var db_config = require('./config/db');
+var request = require('request');
 // const mongodb = require('mongodb');
 const mongoose = require('mongoose');
 var ProConfig = require('./model/proconfig.js');
@@ -12,7 +13,18 @@ var options = {
     limit: '100kb',
     type: 'application/octet-stream'
 };
-
+// 同步进行接口转发
+function requestPromise (option) {
+  return new Promise(function (resolve, reject) {
+    request(option, function (err, res, body) {
+      if (err) {
+        reject(err)
+      } else {
+        resolve(body)
+      }
+    })
+  })
+}
 // mongoose.connect('mongodb://localhost/my_database');
 mongoose.connect('mongodb://172.30.220.22:27017/qaHome')
 
@@ -256,8 +268,8 @@ admin.get('/get_systems_by_type',async  function(req, res) {
 		let fb = getfrontendbackend(pros);
     res.send({
         common: "db,redis,rabbitmq,zookeeper",
-        frontend: fb.frontend.join(" "),
-        backend: fb.backend.join(" ")
+        frontend: fb.frontend.join(","),
+        backend: fb.backend.join(",")
     });
 });
 
@@ -286,6 +298,20 @@ admin.get('/get_systems_by_type_for_temp', async function(req, res) {
       python: fb.python.join(" ")
   });
 });
+// 给jenkins使用获取环境的namespace
+admin.get('/get_namespace_by_type_for_jenkins/:_type', async function(req, res) {
+	let url = "";
+	if(req.params._type == "old"){
+		url = "http://192.168.4.24/api/qahome/list_env"
+	}
+	let ns = await requestPromise({url:url,method:"GET"});
+	ns = JSON.parse(ns);
+	let ns_array = [];
+	for(let ist of ns.details.instances){
+		ns_array.push(ist.name)
+	}
+  res.send(ns_array.join("\n"));
+});
 
 
 // 增加一个新的nginx映射