Move some jenkins vars to default
Bug-related: PROD-27309 (PROD:27309)
Change-Id: Id295144d8b66725920b1871eb54d956db07c632e
diff --git a/defaults/init.yml b/defaults/init.yml
index 6c30995..ef1fe8c 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -9,6 +9,7 @@
- system.defaults.linux_system_repo
- system.defaults.linux_system_file
- system.defaults.git
+- system.defaults.jenkins
- system.defaults.maas
- system.defaults.openstack
- system.defaults.galera
diff --git a/defaults/jenkins.yml b/defaults/jenkins.yml
new file mode 100644
index 0000000..36bcbfb
--- /dev/null
+++ b/defaults/jenkins.yml
@@ -0,0 +1,5 @@
+parameters:
+ _param:
+ jenkins_master_port: 8081
+ jenkins_master_protocol: http
+ jenkins_pipelines_branch: "master"
diff --git a/docker/swarm/stack/jenkins/slave_base.yml b/docker/swarm/stack/jenkins/slave_base.yml
index 3af4cc3..91601ab 100644
--- a/docker/swarm/stack/jenkins/slave_base.yml
+++ b/docker/swarm/stack/jenkins/slave_base.yml
@@ -3,7 +3,6 @@
parameters:
_param:
jenkins_master_host: ${_param:control_vip_address}
- jenkins_master_port: 8081
jenkins_master_url: http://${_param:jenkins_master_host}:${_param:jenkins_master_port}
jenkins_slave_user: ${_param:jenkins_client_user}
jenkins_slave_password: ${_param:jenkins_client_password}
diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index 4f0b3f4..d5b7875 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -8,9 +8,7 @@
jenkins_client_user: none
jenkins_client_password: none
jenkins_master_host: ${_param:control_vip_address}
- jenkins_master_port: 8081
jenkins_aptly_storages: "local"
- jenkins_pipelines_branch: "master"
jenkins:
client:
master:
diff --git a/jenkins/slave/init.yml b/jenkins/slave/init.yml
index c445c14..20dc641 100644
--- a/jenkins/slave/init.yml
+++ b/jenkins/slave/init.yml
@@ -9,8 +9,6 @@
jenkins_slave_user: none
jenkins_slave_password: none
jenkins_master_host: ${_param:control_vip_address}
- jenkins_master_port: 8081
- jenkins_master_protocol: http
java:
environment:
headless: true