D2539.id6423.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2539.id6423.diff
View Options

	diff --git a/pillar/saas/jenkins.sls b/pillar/saas/jenkins.sls
	--- a/pillar/saas/jenkins.sls
	+++ b/pillar/saas/jenkins.sls
	@@ -13,8 +13,12 @@
	jenkins_realms:
	cd:
	ssh_key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICiWLxPzS8X6NraVwsK95gFGe1pIuz+K0n7aw81nabcf jenkins-controller-equatower-cd
	+ external_ssh_keys:
	+ # DevCentral - Drydock (K52) - allow to run CD tasks from Harbourmaster
	+ - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDmUiPWuIchdS12Jk1n3zAhisRecX7lt56hGt+UPz8o/n9UQVqLSjunWkL/yyse/FPpfK6hPpug1Tyd6aDoDByTKcXQhGuk8X9exBuvSrDC0Zo9Sr9wxeyhQPJtRzWvS4b98rfdTD4e7KokVIYis8qJLK/ZvlbA0azHM5vj7qOokHCoObjq+Ihn+V8+jwvzvqljInJy14FgWeS8Kmw+XPOVfQBa+yJ0QNc/Hzsf9p2DcQ9zLvYVLa3zdXXq3dXzPnPYU5IuJ+AMjryWxEfQ0qAtcvrbYEcgZEoN9Xg3ow8N9buU3ydFzk5osyJnvf+OGeKJLWuZ0cp7ut42iGruT8Rb
	+ # DevCentral - Almanac - SSH Key 7
	+ - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFvvkHWigNQG+urb1q0J+ImsJRGfvbqKHpPM5TQMD5oA app@apsile
	network: cd
	-
	ci:
	ssh_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDhhBMTjGguFBy2aOczmZ7NS14b57uoKnzepMtFHh7cpsmbp1Jvf7LOH0niyFOAMlVMqObXJ+8zsd+x9XqMlWUfVOF07D1/GUq09YA7DQsjMc6CdcW68VtcKcUdAnB3yUVX0fZ6bGwnTAnZvAq1oAxuLXE42eBQUti142ic0OF5y5ePs9gu9rOmUzLuydv2+iB34RuopF6VlzROlatyITvr4KPnAhEAuRiVBqWIIWvsT4EMYRlddXC21sPEqUHr3T7FgS2Kmp/1Iw4Hk98srC59lSYOmMLPlTSfuYIoRorGIv3UHeW5DHHeEN+wEnvTPAaO/fiWJfOQBHshWJFN4mOj jenkins@ci.nasqueron.org
	network: ci
	diff --git a/roles/paas-docker/containers/jenkins_agent.sls b/roles/paas-docker/containers/jenkins_agent.sls
	--- a/roles/paas-docker/containers/jenkins_agent.sls
	+++ b/roles/paas-docker/containers/jenkins_agent.sls
	@@ -47,6 +47,13 @@
	- user: 431
	- group: 433

	+{% if 'external_ssh_keys' in realm %}
	+append_external_ssh_keys_for_{{ instance }}:
	+ file.append:
	+ - name: {{ home }}/.ssh/authorized_keys
	+ - text: {{ realm['external_ssh_keys'] }}
	+{% endif %}
	+
	# -------------------------------------------------------------
	# Container
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

File Metadata

Mime Type: text/plain
Expires: Sat, Nov 23, 12:34 (18 h, 57 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 2257049
Default Alt Text: D2539.id6423.diff (1 KB)

D2539.id6423.diffNo OneTemporaryActions

D2539.id6423.diffView Options

File Metadata

Event Timeline

D2539.id6423.diff
No OneTemporary
Actions

D2539.id6423.diff
View Options