BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/306695
Change subject: striker: Set nginx variant via hiera
......................................................................
striker: Set nginx variant via hiera
Avoid potential duplicate resource declaration issues by using hiera
rather than inline parameters. Note that this doesn't guarantee that the
light variant of nginx will actually be installed depending on the hiera
variable resolution. Since we need the most basic variant this shouldn't
cause any problems in practice.
Change-Id: I7770e551826f25bb12270bdf04606c3186f56a02
---
M hieradata/role/common/striker/web.yaml
M modules/striker/manifests/nginx.pp
2 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/306695/1
diff --git a/hieradata/role/common/striker/web.yaml
b/hieradata/role/common/striker/web.yaml
index 7224b6f..2b9bd25 100644
--- a/hieradata/role/common/striker/web.yaml
+++ b/hieradata/role/common/striker/web.yaml
@@ -1,5 +1,6 @@
---
memcached::ip: 127.0.0.1
+nginx::variant: light
striker::nginx::server_name: toolsadmin.wikimedia.org
striker::nginx::docroot: /srv/deployment/striker/deploy/public_html
diff --git a/modules/striker/manifests/nginx.pp
b/modules/striker/manifests/nginx.pp
index 43d9470..bfa25dd 100644
--- a/modules/striker/manifests/nginx.pp
+++ b/modules/striker/manifests/nginx.pp
@@ -19,9 +19,7 @@
$servers,
$port = 80,
){
- class { '::nginx':
- variant => 'light',
- }
+ include ::nginx
nginx::site { 'striker':
content => template('striker/nginx.conf.erb'),
}
--
To view, visit https://gerrit.wikimedia.org/r/306695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7770e551826f25bb12270bdf04606c3186f56a02
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
