Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/315894
Change subject: puppetmaster: replace palladium with puppetmaster1001 as default ...................................................................... puppetmaster: replace palladium with puppetmaster1001 as default palladium is about to be decom'ed. Replace it with puppetmaster1001 in the remaining places where palladium is still used. Change-Id: I83435e628a5f8df57ad53785c4a9cfb10f39e9d9 --- M modules/puppetmaster/files/git/private/gitconfig-master M modules/puppetmaster/files/motd/99-obsolete M modules/role/manifests/puppetmaster/backend.pp M modules/role/manifests/puppetmaster/frontend.pp 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/94/315894/1 diff --git a/modules/puppetmaster/files/git/private/gitconfig-master b/modules/puppetmaster/files/git/private/gitconfig-master index 6626057..621619d 100644 --- a/modules/puppetmaster/files/git/private/gitconfig-master +++ b/modules/puppetmaster/files/git/private/gitconfig-master @@ -7,4 +7,4 @@ denyCurrentBranch = ignore [user] name = "gitpuppet for private repo" - email = git@palladium.eqiad.wmnet + email = git@puppetmaster1001.eqiad.wmnet diff --git a/modules/puppetmaster/files/motd/99-obsolete b/modules/puppetmaster/files/motd/99-obsolete index 0064a2a..2188783 100755 --- a/modules/puppetmaster/files/motd/99-obsolete +++ b/modules/puppetmaster/files/motd/99-obsolete @@ -3,6 +3,6 @@ echo echo "\033[1;31m" echo "This system is no longer an active puppetmaster." -echo "Everything you did here should now be done on palladium." +echo "Everything you did here should now be done on puppetmaster1001." echo "\033[0m" echo diff --git a/modules/role/manifests/puppetmaster/backend.pp b/modules/role/manifests/puppetmaster/backend.pp index c035457..941d1e3 100644 --- a/modules/role/manifests/puppetmaster/backend.pp +++ b/modules/role/manifests/puppetmaster/backend.pp @@ -7,7 +7,7 @@ description => 'Puppetmaster backend' } - $ca_server = hiera('puppetmaster::ca_server', 'palladium.eqiad.wmnet') + $ca_server = hiera('puppetmaster::ca_server', 'puppetmaster1001.eqiad.wmnet') class { '::role::puppetmaster::common': base_config => { diff --git a/modules/role/manifests/puppetmaster/frontend.pp b/modules/role/manifests/puppetmaster/frontend.pp index 7f3eafe..e2d08d7 100644 --- a/modules/role/manifests/puppetmaster/frontend.pp +++ b/modules/role/manifests/puppetmaster/frontend.pp @@ -13,7 +13,7 @@ # Puppet frontends are git masters at least for their datacenter - $ca_server = hiera('puppetmaster::ca_server', 'palladium.eqiad.wmnet') + $ca_server = hiera('puppetmaster::ca_server', 'puppetmaster1001.eqiad.wmnet') if $ca_server == $::fqdn { $ca = true -- To view, visit https://gerrit.wikimedia.org/r/315894 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I83435e628a5f8df57ad53785c4a9cfb10f39e9d9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits