Allow auth on jenkins, split slave system
Change-Id: I35416dcd6baaa0159f2191be9b4029228545aa53
diff --git a/jenkins/client/credential/gerrit.yml b/jenkins/client/credential/gerrit.yml
index 3b7eb0c..b42f5af 100644
--- a/jenkins/client/credential/gerrit.yml
+++ b/jenkins/client/credential/gerrit.yml
@@ -1,7 +1,9 @@
parameters:
+ _param:
+ gerrit_admin_user: admin
jenkins:
client:
credential:
gerrit:
- username: admin
+ username: ${_param:gerrit_admin_user}
key: ${_param:gerrit_admin_private_key}
diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index 36da8b6..02589e0 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -2,11 +2,15 @@
- service.jenkins.support
- service.jenkins.client
parameters:
+ _param:
+ jenkins_client_user: none
+ jenkins_client_password: none
+ jenkins_master_host: ${_param:control_vip_address}
+ jenkins_master_port: 8081
jenkins:
client:
master:
- host: ${_param:cluster_vip_address}
- port: 8081
- # When Jenkins auth is enabled
- #user: admin
- #password: dummy
+ host: ${_param:jenkins_master_host}
+ port: ${_param:jenkins_master_port}
+ user: ${_param:jenkins_client_user}
+ password: ${_param:jenkins_client_password}