[MediaWiki-commits] [Gerrit] operations/puppet[production]: eventlogging: create compound role, consolidate hiera
Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401554 ) Change subject: eventlogging: create compound role, consolidate hiera .. eventlogging: create compound role, consolidate hiera Change-Id: I6d6802fbb29daa714f3cadeab55a98350419dc65 --- D hieradata/hosts/eventlog1001.yaml R hieradata/role/common/eventlogging/analytics.yaml M manifests/site.pp A modules/role/manifests/eventlogging/analytics.pp 4 files changed, 14 insertions(+), 12 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/hosts/eventlog1001.yaml b/hieradata/hosts/eventlog1001.yaml deleted file mode 100644 index 86f9540..000 --- a/hieradata/hosts/eventlog1001.yaml +++ /dev/null @@ -1,3 +0,0 @@ -admin::groups: - - eventlogging-admins - - eventlogging-roots diff --git a/hieradata/role/common/eventlogging.yaml b/hieradata/role/common/eventlogging/analytics.yaml similarity index 100% rename from hieradata/role/common/eventlogging.yaml rename to hieradata/role/common/eventlogging/analytics.yaml diff --git a/manifests/site.pp b/manifests/site.pp index d4c0c31..acbcaf4 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -843,15 +843,7 @@ # Receives log data from Kafka processes it, and broadcasts # to Kafka Schema based topics. node 'eventlog1001.eqiad.wmnet' { -role(eventlogging::analytics::zeromq, -eventlogging::analytics::processor, -eventlogging::analytics::mysql, -eventlogging::analytics::files, -logging::mediawiki::errors) - -include ::standard -include ::base::firewall -interface::add_ip6_mapped { 'main': } +role(eventlogging::analytics) } # virtual machine for mailman list server diff --git a/modules/role/manifests/eventlogging/analytics.pp b/modules/role/manifests/eventlogging/analytics.pp new file mode 100644 index 000..f794721 --- /dev/null +++ b/modules/role/manifests/eventlogging/analytics.pp @@ -0,0 +1,13 @@ +class role::eventlogging::analytics { +system::role { 'eventlogging_host': +description => 'eventlogging host' +} +include ::standard +include ::base::firewall +interface::add_ip6_mapped { 'main': } +include ::role::eventlogging::analytics::zeromq +include ::role::eventlogging::analytics::processor +include ::role::eventlogging::analytics::mysql +include ::role::eventlogging::analytics::files +include ::role::logging::mediawiki::errors +} -- To view, visit https://gerrit.wikimedia.org/r/401554 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6d6802fbb29daa714f3cadeab55a98350419dc65 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe LavagettoGerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Ottomata Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: eventlogging: create compound role, consolidate hiera
Giuseppe Lavagetto has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401554 ) Change subject: eventlogging: create compound role, consolidate hiera .. eventlogging: create compound role, consolidate hiera Change-Id: I6d6802fbb29daa714f3cadeab55a98350419dc65 --- D hieradata/hosts/eventlog1001.yaml R hieradata/role/common/eventlogging/analytics/host.yaml M manifests/site.pp A modules/role/manifests/eventlogging/analytics/host.pp 4 files changed, 14 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/54/401554/1 diff --git a/hieradata/hosts/eventlog1001.yaml b/hieradata/hosts/eventlog1001.yaml deleted file mode 100644 index 86f9540..000 --- a/hieradata/hosts/eventlog1001.yaml +++ /dev/null @@ -1,3 +0,0 @@ -admin::groups: - - eventlogging-admins - - eventlogging-roots diff --git a/hieradata/role/common/eventlogging.yaml b/hieradata/role/common/eventlogging/analytics/host.yaml similarity index 100% rename from hieradata/role/common/eventlogging.yaml rename to hieradata/role/common/eventlogging/analytics/host.yaml diff --git a/manifests/site.pp b/manifests/site.pp index 39e0ef6..30f6a83 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -824,15 +824,7 @@ # Receives log data from Kafka processes it, and broadcasts # to Kafka Schema based topics. node 'eventlog1001.eqiad.wmnet' { -role(eventlogging::analytics::zeromq, -eventlogging::analytics::processor, -eventlogging::analytics::mysql, -eventlogging::analytics::files, -logging::mediawiki::errors) - -include ::standard -include ::base::firewall -interface::add_ip6_mapped { 'main': } +role(eventlogging::analytics::host) } # virtual machine for mailman list server diff --git a/modules/role/manifests/eventlogging/analytics/host.pp b/modules/role/manifests/eventlogging/analytics/host.pp new file mode 100644 index 000..35d9549 --- /dev/null +++ b/modules/role/manifests/eventlogging/analytics/host.pp @@ -0,0 +1,13 @@ +class role::eventlogging::analytics::host { +system::role { 'eventlogging_host': +description => 'eventlogging host' +} +include ::standard +include ::base::firewall +interface::add_ip6_mapped { 'main': } +include ::role::eventlogging::analytics::zeromq +include ::role::eventlogging::analytics::processor +include ::role::eventlogging::analytics::mysql +include ::role::eventlogging::analytics::files +include ::role::logging::mediawiki::errors +} -- To view, visit https://gerrit.wikimedia.org/r/401554 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d6802fbb29daa714f3cadeab55a98350419dc65 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits