Gehel has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/369695 )
Change subject: redis - instance names should be strings in puppet 4 ...................................................................... redis - instance names should be strings in puppet 4 Since the redis instances (`profile::redis::master::instances`) are used as resource titles, they should be strings. I found this error while checking maps for compatibility with puppet 4. OCG is affected as well. Change-Id: I8c65d0039d84bec38c639bfd3b25f5dbc66182a9 --- M hieradata/role/common/maps/master.yaml M hieradata/role/common/maps/test/master.yaml M hieradata/role/common/ocg.yaml 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Gehel: Looks good to me, approved diff --git a/hieradata/role/common/maps/master.yaml b/hieradata/role/common/maps/master.yaml index 242f3f7..29ff9ed 100644 --- a/hieradata/role/common/maps/master.yaml +++ b/hieradata/role/common/maps/master.yaml @@ -27,6 +27,6 @@ cassandra::metrics::blacklist: - .*\.metrics\.Table\..*$ -profile::redis::master::instances: [6379] +profile::redis::master::instances: ['6379'] profile::redis::master::settings: bind: "0.0.0.0" diff --git a/hieradata/role/common/maps/test/master.yaml b/hieradata/role/common/maps/test/master.yaml index aaedc19..bc4a6cc 100644 --- a/hieradata/role/common/maps/test/master.yaml +++ b/hieradata/role/common/maps/test/master.yaml @@ -24,7 +24,7 @@ cassandra::metrics::blacklist: - .*\.metrics\.Table\..*$ -profile::redis::master::instances: [6379] +profile::redis::master::instances: ['6379'] profile::redis::master::settings: bind: "0.0.0.0" diff --git a/hieradata/role/common/ocg.yaml b/hieradata/role/common/ocg.yaml index 6740371..57ff404 100644 --- a/hieradata/role/common/ocg.yaml +++ b/hieradata/role/common/ocg.yaml @@ -7,7 +7,7 @@ ocg::statsd_host: "statsd.eqiad.wmnet" ocg::graylog_host: "logstash1002.eqiad.wmnet" role::ocg::tmpfs_size: '32G' -profile::redis::master::instances: [6379] +profile::redis::master::instances: ['6379'] profile::redis::master::settings: maxmemory: "2gb" save: "" -- To view, visit https://gerrit.wikimedia.org/r/369695 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8c65d0039d84bec38c639bfd3b25f5dbc66182a9 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org> Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
