From: Peter Palfrader Date: Mon, 31 Aug 2015 11:39:30 +0000 (+0200) Subject: Rename jenkins to jenko (RT:#5781) X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=12f7395f08350abd27fa112f75382caa1b1bd6a3;p=mirror%2Fdsa-puppet.git Rename jenkins to jenko (RT:#5781) --- diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index e085bca3b..36f13695c 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -53,7 +53,7 @@ nameinfo: hasse.debian.org: Johann Adolph Hasse (March 25th, 1699 - December 16th, 1783) henze.debian.org: Hans Werner Henze (July 1st, 1926 - October 27th, 2012) hoiby.debian.org: Lee Henry Hoiby (February 17th, 1926 - March 28th, 2011) - jenkins.debian.org: John Jenkins (1592 - 1678) + jenko.debian.org: Davorin Jenko (November 9th, 1835 - November 25th. 1914) jerea.debian.org: Hilda Jerea (March 17th, 1916 - May 14th, 1980) kaufmann.debian.org: Georg Friedrich Kauffmann (February 14th, 1679 - February 27th, 1735) klecker.debian.org: Dedicated to Joel 'Espy' Klecker (1979 - July 11th, 2000) diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index 813856fc2..ca13174a0 100644 --- a/modules/ferm/manifests/per-host.pp +++ b/modules/ferm/manifests/per-host.pp @@ -512,7 +512,7 @@ REJECT reject-with icmp-admin-prohibited rule => '&SERVICE_RANGE(udp, 69, ( 172.28.17.0/24 ))' } } - jenkins: { + jenko: { @ferm::rule { 'dsa-tftp': description => 'Allow tftp access', rule => '&SERVICE_RANGE(udp, 69, ( 192.168.2.0/24 206.12.19.0/24 ))' diff --git a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb index 267442879..b7ea30ec4 100644 --- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb +++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb @@ -75,10 +75,10 @@ multipaths { wwid 3600c0ff000d5f6bd04849b5101000000 alias r10-elgar } - # jenkins + # jenko multipath { wwid 3600c0ff000d5f6bdf38f9b5101000000 - alias r10-jenkins + alias r10-jenko } # fano multipath {