Giuseppe Lavagetto has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/316345

Change subject: role::parsoid: switch to role::lvs::realserver
......................................................................

role::parsoid: switch to role::lvs::realserver

Change-Id: I9ad0df5c39054ce4f3c9557bf0c392a7956e9835
---
M hieradata/role/codfw/parsoid.yaml
M hieradata/role/common/parsoid.yaml
M hieradata/role/eqiad/parsoid.yaml
M manifests/role/parsoid.pp
4 files changed, 5 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/45/316345/1

diff --git a/hieradata/role/codfw/parsoid.yaml 
b/hieradata/role/codfw/parsoid.yaml
index 2073f23..a10dfcb 100644
--- a/hieradata/role/codfw/parsoid.yaml
+++ b/hieradata/role/codfw/parsoid.yaml
@@ -1,5 +1,4 @@
 debdeploy::grains:
   debdeploy-parsoid-codfw:
     value: standard
-lvs::realserver::realserver_ips:
-  - 10.2.1.28
+
diff --git a/hieradata/role/common/parsoid.yaml 
b/hieradata/role/common/parsoid.yaml
index 7138624..63f3b9e 100644
--- a/hieradata/role/common/parsoid.yaml
+++ b/hieradata/role/common/parsoid.yaml
@@ -2,3 +2,5 @@
   - parsoid-roots
   - parsoid-admin
 cluster: parsoid
+role::lvs::realserver::pools:
+  parsoid: {}
diff --git a/hieradata/role/eqiad/parsoid.yaml 
b/hieradata/role/eqiad/parsoid.yaml
index 6f3fb72..504300a 100644
--- a/hieradata/role/eqiad/parsoid.yaml
+++ b/hieradata/role/eqiad/parsoid.yaml
@@ -1,5 +1,3 @@
 debdeploy::grains:
   debdeploy-parsoid-eqiad:
     value: standard
-lvs::realserver::realserver_ips:
-  - 10.2.2.28
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 92cb226..62a7335 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -6,13 +6,9 @@
     }
 
     include base::firewall
-    include lvs::realserver
 
-    # LVS pooling/depoling scripts
-    include ::lvs::configuration
-    conftool::scripts::service { 'parsoid':
-        lvs_services_config => $::lvs::configuration::lvs_services,
-        lvs_class_hosts     => $::lvs::configuration::lvs_class_hosts,
+    if hiera('has_lvs', true) {
+        include role::lvs::realserver
     }
 
     include ::parsoid

-- 
To view, visit https://gerrit.wikimedia.org/r/316345
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ad0df5c39054ce4f3c9557bf0c392a7956e9835
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to