Alexandros Kosiaris has submitted this change and it was merged.
Change subject: maps: Also move hiera config files to match maps::server
......................................................................
maps: Also move hiera config files to match maps::server
Also:
* Fix a duplicate declaration about cassandra-cql ferm definition
* Fix the correct path to role maps templates that had been moved before
* Remove the ferm rules and add a comment
* Make sure to avoid duplicate definitions in the case of using the same
repo for more than one software on the same node
Change-Id: I92ab927f635716d1a7022ea047859ec8d9f9283d
---
R hieradata/role/codfw/maps/server.yaml
R hieradata/role/common/maps/server.yaml
M modules/role/manifests/maps/server.pp
M modules/service/manifests/node.pp
4 files changed, 15 insertions(+), 28 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/hieradata/role/codfw/maps.yaml
b/hieradata/role/codfw/maps/server.yaml
similarity index 100%
rename from hieradata/role/codfw/maps.yaml
rename to hieradata/role/codfw/maps/server.yaml
diff --git a/hieradata/role/common/maps.yaml
b/hieradata/role/common/maps/server.yaml
similarity index 100%
rename from hieradata/role/common/maps.yaml
rename to hieradata/role/common/maps/server.yaml
diff --git a/modules/role/manifests/maps/server.pp
b/modules/role/manifests/maps/server.pp
index 72bf9a0..71264c8 100644
--- a/modules/role/manifests/maps/server.pp
+++ b/modules/role/manifests/maps/server.pp
@@ -66,32 +66,15 @@
}
# Cassandra Thrift interface, used by cqlsh
- ferm::service { 'cassandra-cql':
+ # TODO: Is that really true? Since CQL 3.0 it should not be. Revisit
+ ferm::service { 'cassandra-cql-thrift':
proto => 'tcp',
port => '9160',
srange => "(${cassandra_hosts_ferm})",
}
- # Kartotherian
- ferm::service { 'kartotherian':
- proto => 'tcp',
- port => '6533',
- srange => '$INTERNAL',
- }
-
- # Tilerator
- ferm::service { 'tilerator':
- proto => 'tcp',
- port => '6534',
- srange => '$INTERNAL',
- }
-
- # TileratorUI
- ferm::service { 'tileratorui':
- proto => 'tcp',
- port => '6535',
- srange => '$INTERNAL',
- }
+ # NOTE: Kartotherian, tilerator, tileratorui get their ferm rules via
+ # service::node. That is an exception from our rules but it was deemed OK
}
# Sets up a maps server master
@@ -141,7 +124,7 @@
owner => 'root',
group => 'root',
mode => '0400',
- content => template('maps/grants.sql.erb'),
+ content => template('role/maps/grants.sql.erb'),
}
# Cassandra grants
$cassandra_kartotherian_pass = hiera('maps::cassandra_kartotherian_pass')
@@ -151,7 +134,7 @@
owner => 'root',
group => 'root',
mode => '0400',
- content => template('maps/grants.cql.erb'),
+ content => template('role/maps/grants.cql.erb'),
}
}
diff --git a/modules/service/manifests/node.pp
b/modules/service/manifests/node.pp
index 300cd50..a161e2b 100644
--- a/modules/service/manifests/node.pp
+++ b/modules/service/manifests/node.pp
@@ -102,14 +102,18 @@
) {
case $deployment {
'scap3': {
- service::deploy::scap{ $repo:
- service_name => $title,
- before => Base::Service_unit[$title],
+ if ! defined(Service::Deploy::Trebuchet[$repo]) {
+ service::deploy::scap{ $repo:
+ service_name => $title,
+ before => Base::Service_unit[$title],
+ }
}
}
default: {
- service::deploy::trebuchet{ $repo:
- before => Base::Service_unit[$title]
+ if ! defined(Service::Deploy::Trebuchet[$repo]) {
+ service::deploy::trebuchet{ $repo:
+ before => Base::Service_unit[$title]
+ }
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/276471
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I92ab927f635716d1a7022ea047859ec8d9f9283d
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
