jenkins-bot has submitted this change and it was merged.
Change subject: VE: Require RESTBase instead of Parsoid and expose the needed
ports
......................................................................
VE: Require RESTBase instead of Parsoid and expose the needed ports
This patch switches the visualeditor role to use directly RESTBase
instead of Parsoid. It also makes Vagrant expose the ports of the
services used by VE - Citoid, RESTBase and Parsoid.
Also in this patch: expose Parsoid's port when its role is enabled. Do
the same for RESTBase, since it uses Parsoid behind the scenes.
Bug: T111223
Change-Id: Iffeb34085ca51e29bc2768acdc631f4bbee2f601
---
M puppet/modules/role/manifests/visualeditor.pp
A puppet/modules/role/settings/parsoid.yaml
M puppet/modules/role/settings/restbase.yaml
A puppet/modules/role/settings/visualeditor.yaml
4 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/role/manifests/visualeditor.pp
b/puppet/modules/role/manifests/visualeditor.pp
index f4e7f18..7c8b6a9 100644
--- a/puppet/modules/role/manifests/visualeditor.pp
+++ b/puppet/modules/role/manifests/visualeditor.pp
@@ -5,7 +5,7 @@
include ::role::cite
include ::role::citoid
include ::role::parserfunctions
- include ::role::parsoid
+ include ::role::restbase
include ::role::scribunto
include ::role::templatedata
include ::role::uls
diff --git a/puppet/modules/role/settings/parsoid.yaml
b/puppet/modules/role/settings/parsoid.yaml
new file mode 100644
index 0000000..29b1c17
--- /dev/null
+++ b/puppet/modules/role/settings/parsoid.yaml
@@ -0,0 +1,2 @@
+forward_ports:
+ 8000: 8000
diff --git a/puppet/modules/role/settings/restbase.yaml
b/puppet/modules/role/settings/restbase.yaml
index b260857..78b849e 100644
--- a/puppet/modules/role/settings/restbase.yaml
+++ b/puppet/modules/role/settings/restbase.yaml
@@ -1,3 +1,3 @@
forward_ports:
7231: 7231
-
+ 8000: 8000
diff --git a/puppet/modules/role/settings/visualeditor.yaml
b/puppet/modules/role/settings/visualeditor.yaml
new file mode 100644
index 0000000..78e6262
--- /dev/null
+++ b/puppet/modules/role/settings/visualeditor.yaml
@@ -0,0 +1,4 @@
+forward_ports:
+ 1970: 1970 # Citoid
+ 7231: 7231 # RESTBase
+ 8000: 8000 # Parsoid
--
To view, visit https://gerrit.wikimedia.org/r/243530
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iffeb34085ca51e29bc2768acdc631f4bbee2f601
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
