| commit | 1d89b3b85bc368d9107a793f8f4ef4cfefa5aa4c | [log] [tgz] |
|---|---|---|
| author | Kirill Mashchenko <kmashchenko@mirantis.com> | Mon Oct 22 10:37:05 2018 +0400 |
| committer | Kirill Mashchenko <kmashchenko@mirantis.com> | Wed Feb 13 13:41:13 2019 +0400 |
| tree | e54cca3a4109d2b389ac11ff22da63d5a47a4214 | |
| parent | a68ececc95974654c1a8ba5158b80aee1a32edda [diff] |
Add posibility to set slave agent port Related-PROD: https://mirantis.jira.com/browse/PROD-21891 Change-Id: Id61042e2f197a1bfb70dc693452584938d2cc118
diff --git a/jenkins/files/config.xml b/jenkins/files/config.xml index e9a7520..c5ee87d 100644 --- a/jenkins/files/config.xml +++ b/jenkins/files/config.xml
@@ -91,7 +91,7 @@ {%- endif %} </views> <primaryView>All</primaryView> - <slaveAgentPort>54906</slaveAgentPort> + <slaveAgentPort>{{ jenkins.master.slave_agent_port }}</slaveAgentPort> <label>master</label> <nodeProperties/> <globalNodeProperties/>
diff --git a/jenkins/schemas/master.yaml b/jenkins/schemas/master.yaml index 1a075d1..326b826 100644 --- a/jenkins/schemas/master.yaml +++ b/jenkins/schemas/master.yaml
@@ -100,6 +100,9 @@ name: description: Plugin name type: string + slave_agent_port: + description: Jenkins JNLP agents port + type: integer definitions: _slaves:
diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml index 3a8a82e..060a10a 100644 --- a/metadata/service/master/single.yml +++ b/metadata/service/master/single.yml
@@ -6,6 +6,7 @@ jenkins: master: enabled: true + slave_agent_port: 54906 sudo: false mode: "NORMAL" http:
diff --git a/tests/pillar/master.sls b/tests/pillar/master.sls index ded11aa..ffbc039 100644 --- a/tests/pillar/master.sls +++ b/tests/pillar/master.sls
@@ -3,6 +3,7 @@ enabled: true mode: EXCLUSIVE no_config: false + slave_agent_port: 54906 slaves: - name: slave01 label: pbuilder