From b0e417273d09cb9b97813ab8bd03c01db28eb103 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 7 Mar 2019 08:57:55 -0800 Subject: [PATCH] Update git submodules * Update puppet-askbot from branch 'master' - Be more forgiving in module deps list As time has moved on we've updated module versions making the pins in this module's metadata.json inaccurate. Relax the rules so that we can continue to update global module versions as necessary without raising warnings. Change-Id: Iaac15934b31a427370608ba439937f73ad5f64c7 - Fix template variable I forgot that on puppet 3, scope.lookupvar returns :undef instead of nil when it looks up a variable set to 'undef'. Since we're not setting the chain file in our beaker tests, this causes an invalid apache config to be rendered. This patch ensures the file explicitly checks for both nil and :undef. On puppet 4, checking for just nil will be sufficient. Change-Id: I7fd806c65f1aef95618a4549b24c6fa21aa3fe29 - Merge "Use earlier six release" - Merge "Don't run syncdb or migrate until after install" - Merge "Restart apache and celeryd on upgrade" - Merge "Use pip instead of setup.py when installing Askbot" - Merge "Pin stopforumspam" - Merge "Ensure more correct ordering" - Merge "Don't require virtualenv package" - Merge "Add systemd support" - Merge "Pin captcha version" - Merge "Update settings" - Merge "Remove old apache logs" - 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: Ib5f25bad8e5be39530113bf19ea2951cc9344961 - Merge "Fix scope of vhost template variables" - Use earlier six release As described, the code is incompatible with the latest six. Pin this till we can update the underlying django, etc. Change-Id: Ic13b80ba53331f5375cbb35ddf86880313415332 - Pin stopforumspam Later versions of this became incompatible with the django used with askbot. Pin it. Change-Id: Ic409a368d31728428f215db89a0c605967fe5cbf - Ensure more correct ordering There were a few parts of this that could get out of order; ensure more correct ordering. Change-Id: Ic010bb70915d37ce55e9f5531a2c5baa15808595 - Don't require virtualenv package Use puppet-python's checks to ensure presence of python packages. This way we don't create conflicting Package['virtualenv'] entries. Change-Id: I3435a2527f4712d068c5a3c43728bed6011e1ebd - Add systemd support This adds a basic service file for celeryd and associated bits to install it on Xenial and beyond. Change-Id: I58ab956832acabf9e5af5f815e37ed1eb365a649 - Pin captcha version Pin to the version currently deployed in production while we work through Xenial upgrade. We can unpin when we try to update the askbot version. Change-Id: I991c503f9f4a7e01be7ee58ba496f8c4f671c1a1 - Update settings The askbot production settings are deployed from system-config, and this version has become out of sync with what's actually required to start-up askbot. Update it. Change-Id: I66da411a8c000d2be5e0676d536441b5f03bfdd2 - Remove old apache logs Just keep one month worth Change-Id: I69903d494d117ff0c8e1ac48dadc8d1619e724b6 - Add clean_session.log for rotation This file is growing unbounded; let's rotate it root@ask:/srv/askbot-site/log# ls -lh -rw-r--r-- 1 root root 1.7G Apr 5 01:10 clean_session.log Change-Id: I051cd5868591bae021b61ab68f91ad9af16d6896 - 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 the manifests cannot be found when it is referenced in the httpd::vhost defined type and will be evaluated as nil when puppet runs. Use scope.lookupvar instead to be explicit about the variable's source. [1] https://puppet.com/docs/puppet/4.10/lang_updating_manifests.html#dynamic-scoping-in-erb Change-Id: I344be46a2e69d0eadda9148e1b7dd1f73c7a1edd - Don't run syncdb or migrate until after install The syncdb and migrate execs need an upgraded Askbot package installed in the venv before they're run, so indicate this dependency relationship accordingly. Change-Id: Ibf191682e238fcf5dcebc5a5c2c50d8b63913153 - Restart apache and celeryd on upgrade When upgrading, after the migrate exec completes, notify the apache2 and askbot-celeryd services so they will be restarted. Change-Id: I0a7f3987d782c52e85aa2f87186d2beb367d5b6b - Use pip instead of setup.py when installing Askbot Calling python setup.py install seems to not properly uninstall the old version of Askbot, but using pip install upgrades correctly and is more in line with our usual pattern in other modules. Change-Id: Iec6aef76a2ddf155dba26f37cefa94439c47e829 --- puppet-askbot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puppet-askbot b/puppet-askbot index 7abbdafc62..0356069e08 160000 --- a/puppet-askbot +++ b/puppet-askbot @@ -1 +1 @@ -Subproject commit 7abbdafc622114e009d0ad70f8efae1a4c8c8ae2 +Subproject commit 0356069e082c48fe3f1af3a121b328ab543067c7