commit 4e27fab4364d82d147999edfc9f915e872b580dc
author Jiri Broulik <jbroulik@mirantis.com> Fri Oct 20 15:51:51 2017 +0000
committer Gerrit Code Review <gerrit2@7cd0c2eb159e> Fri Oct 20 15:51:51 2017 +0000
tree cf4de1bdc1a465268c204127cca889817ea2b4bd
parent 29b3410b6c13dad36d24a3a609c87048fd62d5c9
parent a93990534cfc493b0f9ee7c5a5765453d33443a0

Merge "Move jenkins credentials for devops_portal to devops_portal"

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: