Faidon Liambotis has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/350775 )
Change subject: cassandra: switch to interface::alias
......................................................................
cassandra: switch to interface::alias
Also drop the $rpc_interface variable, instead of passing
interface => $rpc_interface
to interface::alias, as it defaults to that.
Change-Id: Id6882a15b0a5a795cd2bd897049fe9c05988b0ca
---
M modules/cassandra/manifests/instance.pp
1 file changed, 2 insertions(+), 6 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/cassandra/manifests/instance.pp
b/modules/cassandra/manifests/instance.pp
index d555c70..2a76fea 100644
--- a/modules/cassandra/manifests/instance.pp
+++ b/modules/cassandra/manifests/instance.pp
@@ -27,7 +27,6 @@
# * jmx_port must be unique per-host
# * listen_address address to use for cassandra clients
# * rpc_address address to use for cassandra cluster traffic
-# * rpc_interface if specified, add rpc_address to this interface
#
# Note any other parameter from the "cassandra" class is in scope and
# will be inherited here and can be used e.g. in templates.
@@ -54,11 +53,8 @@
# Add the IP address if not present
if $rpc_address != $facts['ipaddress'] {
- $rpc_interface = $facts['interface_primary']
- interface::ip { "cassandra-${instance_name}_rpc_${rpc_interface}":
- interface => $rpc_interface,
- address => $rpc_address,
- prefixlen => '32',
+ interface::alias { "cassandra-${instance_name}":
+ ipv4 => $rpc_address,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/350775
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id6882a15b0a5a795cd2bd897049fe9c05988b0ca
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
