Faidon Liambotis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/350777 )
Change subject: phabricator: switch to interface::alias
......................................................................
phabricator: switch to interface::alias
This is not a straight replacement: the old manifest used a /21 netmask
for the IPv4 address instead of a /32, although that was definitely
wrong (and it was also not in Hiera, despite the address itself being in
Hiera). Easier to cleanup manually as these are just a few hosts that are
affected.
Change-Id: Ieded3b493a7fb0b7d99fd4eaf18d99154f2b431d
---
M modules/role/manifests/phabricator/main.pp
1 file changed, 3 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/77/350777/1
diff --git a/modules/role/manifests/phabricator/main.pp
b/modules/role/manifests/phabricator/main.pp
index 73e6a67..c4969e2 100644
--- a/modules/role/manifests/phabricator/main.pp
+++ b/modules/role/manifests/phabricator/main.pp
@@ -169,23 +169,9 @@
# lint:endignore
# This exists to offer git services
- $vcs_address_ipv4 = hiera('phabricator::vcs::address::v4', undef)
- if $vcs_address_ipv4 != undef {
- interface::ip { 'role::phabricator::main::ipv4':
- interface => 'eth0',
- address => $vcs_address_ipv4,
- prefixlen => '21',
- }
- }
- $vcs_address_ipv6 = hiera('phabricator::vcs::address::v6', undef)
- if $vcs_address_ipv6 != undef {
- interface::ip { 'role::phabricator::main::ipv6':
- interface => 'eth0',
- address => $vcs_address_ipv6,
- prefixlen => '128',
- # mark as deprecated = never pick this address unless explicitly
asked
- options => 'preferred_lft 0',
- }
+ interface::ip { 'phabricator vcs':
+ ipv4 => hiera('phabricator::vcs::address::v4', undef),
+ ipv6 => hiera('phabricator::vcs::address::v6', undef),
}
class { '::phabricator::tools':
--
To view, visit https://gerrit.wikimedia.org/r/350777
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieded3b493a7fb0b7d99fd4eaf18d99154f2b431d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
