From 223be87b582451a932eedc711ffaca153488462b Mon Sep 17 00:00:00 2001 From: Zuul Date: Fri, 1 Mar 2019 19:55:14 +0000 Subject: [PATCH] Update git submodules * Update puppet-etherpad_lite from branch 'master' - Merge "Bump eplite version in rspec tests" - Enable mod_proxy_wstunnel We want to use websockets. Websockets requires that mod_proxy_wstunnel be enabled. THis wasn't enabled by default so go ahead and enable it here. Change-Id: I2d9a1ec7cffba461d7d36dceeef241956f6d732b - Actually use connection-tuning configuration The connection tuning configuration setup relied on a symlink that was broken. Fix the symlink by fixing the target filename. Also we update the symlink name to have a .conf suffix since everything else has that suffix on Xenial. Note this removes support for precise connection tuning to simplify the problem as precise is no longer supported by ubuntu. Change-Id: I094a43b2395aeef17175cea6db5dc2469b67ed6d - Bump eplite version in rspec tests This updates the tests to test installation for the same version of etherpad that we are running in production. Change-Id: I3624b79a8bb2c9c362037d1b025a3df9bf7c701f - Ensure the custom js dir is created This appears to be a still supported api for customizing things, http://etherpad.org/doc/v1.7.0/#index_custom_static_files, but the repo doesn't have a custom dir precreated for us. Ensure this directory is created before we try to write to it. Change-Id: I432d388cd43fc4e5dfc31115264365b15eb43215 - Fix env for plugin installs In an earlier change we set up npm installations to happen in the eplite user's homedir rather than in the log dir. We did this because with systemd we no longer have a log dir on all installations. The etherpad lite plugin installation was still attemping to use the log dir which doesn't work on newer systems. Update this plugin installation process to use the homedir like the normal installation process. Also add plugin installation to the tests we run to test this works now. Change-Id: I5cff75c89b16d61c4902c920259b82463306833e - Merge "Fix httpd mod defined types for puppet 4" - Merge "Turn off binary symlink in nodejs module" - Merge "Add basic rspec test" - Fix httpd mod defined types for puppet 4 Fix the namespacing of the references to the Httpd::Mod defined resource type so that it can be found in puppet 4. Change-Id: I3746af60035899121a26928ae9574b3f6e3b3753 - Turn off binary symlink in nodejs module On Xenial, the nodejs puppet module tries to create a symlink from /usr/bin/node to /usr/bin/nodejs. Depending on the resource ordering, this might happen before or after the nodejs package creates its own /usr/bin/node. If puppet has the chance to make the symlink itself, it breaks node by creating a broken link cycle. This patch uses the legacy_debian_symlinks parameter to prevent the puppet module from doing that. This problem was fixed and the option was deprecated and removed in later versions of the nodejs puppet module, so we will have to remove the parameter if we update the nodejs module. In this case, on puppet 3 a quirk of the resource ordering was causing the module not to be idempotent since the second puppet run would change the file to a symlink, so this patch has the side benefit of also allowing us to add a test for idempotency. With that second puppet run, the etherpad service now has enough time to fully start up and we can uncomment the curl test. Change-Id: Ic834ad6f0828cc2d20810e48bb053f9b14659c4a - Add basic rspec test Add a basic deployment test Change-Id: I3ebec9b0c82a228f9d3a4e3d865ca44a233ec83e - Update Gemfile for Zuulv3 The logic in the Gemfile was relying on Zuulv2 variables to find out whether the spec helper gem was already available on disk, and since Zuulv3 has changed things it was failing to find it and downloading the master version instead. This patch ensures the Gemfile looks for the gem in the right place when running in CI. Change-Id: I677a2ca36099e3d1157e41bae72d71ec56f1adc1 - Merge "Fix scope of vhost template variables" - Merge "Fix defined type namespacing" - Fix scope of vhost template variables Dynamic scoping for variables in ERB templates was removed in puppet 4[1] which means that the variables defined in the manifest cannot be found when it is referenced in the httpd::vhost defined type and will be evaluated as nil when puppet runs. Use the scope object instead to be explicit about the variable's source. The scope object and scope.lookupvar return :undef instead of nil if the variable is undefined, and we expect it to sometimes be undefined, so handle that too. [1] https://puppet.com/docs/puppet/4.10/lang_updating_manifests.html#dynamic-scoping-in-erb Change-Id: Ie9d943424aafa5d1d09586dc2cb61441c6d2628b - Fix defined type namespacing Without this patch, puppet 4 apply tests can't find the mod defined type and fail with: Evaluation Error: Resource type not found: Mod at /etc/puppetlabs/code/modules/ethercalc/manifests/apache.pp:43:15 This patch ensures the resource reference is namespaced the resource declaration is already namespaced. Change-Id: Iff4edae152bb1286667db5312b44c3f1d0e10add - Set legacy_debian_symlinks to true After update nodejs from system to 6.x in patch[1], ubuntu xenial nodejs related files will be link to a loop: /usr/local/bin/node -> /usr/bin/nodejs /usr/bin/node -> /usr/bin/nodejs /usr/bin/nodejs -> /etc/alternatives/nodejs /etc/alternatives/nodejs -> /usr/bin/node Also, in openstack-infra/system-config, the code we have for etherpad node can't bringup one, we should remove the node 'Node-OS: xenial' that may misslead others This patch is aimed to help etherpad node's system upgrade to xenial. [1] Ied9e5bd7ffa16f1832d3e1e26d0886de67f98f72 Change-Id: I6f7d50bed470916f7b150785ef68d34f336cb0ce --- puppet-etherpad_lite | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puppet-etherpad_lite b/puppet-etherpad_lite index 5b9395aea1..97245cd023 160000 --- a/puppet-etherpad_lite +++ b/puppet-etherpad_lite @@ -1 +1 @@ -Subproject commit 5b9395aea1a910cb12ab04f9a266da1e7136256e +Subproject commit 97245cd0230f12a54b1472553b525bb35c582bac