commit fe4aa384d17b441219c2f0da24d9cc3bb711ccef
author Jiri Broulik <jbroulik@mirantis.com> Mon Oct 23 06:24:30 2017 +0000
committer Gerrit Code Review <gerrit2@7cd0c2eb159e> Mon Oct 23 06:24:30 2017 +0000
tree 897b383ca3c230f0b3c7b1a6d4edcf3c1d1d2872
parent 4e27fab4364d82d147999edfc9f915e872b580dc
parent ec6625659c480f9f169a2012d1505ad5b6ae3494

Merge "add ceph osd host jenkins pipeline"

devops_portal/service/jenkins.yml

diff --git a/devops_portal/service/jenkins.yml b/devops_portal/service/jenkins.yml
index 07c001d..ee00912 100644
--- a/devops_portal/service/jenkins.yml
+++ b/devops_portal/service/jenkins.yml
@@ -1,4 +1,7 @@
 parameters:
+  _param:
+    oss_jenkins_user: admin
+    oss_jenkins_password: password
   devops_portal:
     config:
       service:

docker/swarm/stack/jenkins/master.yml

diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index 96d4e10..e974dee 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -6,8 +6,6 @@
     jenkins_master_extra_opts: ""
     jenkins_master_executors_num: 4
     jenkins_master_max_concurent_requests: 40
-    oss_jenkins_user: admin
-    oss_jenkins_password: password
   docker:
     client:
       stack:

jenkins/client/approved_scripts.yml

diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index 4e3d1d1..6afd67e 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -14,6 +14,7 @@
         - method groovy.lang.GroovyObject getProperty java.lang.String
         - method groovy.util.Node attributes
         - method groovy.util.XmlParser parse java.io.File
+        - method groovy.util.XmlParser parseText java.lang.String
         - method hudson.PluginManager getPlugins
         - method hudson.PluginWrapper getShortName
         - method hudson.model.Item getName