From f43a25da6b06689747ff92d11255b80ae65c8faa Mon Sep 17 00:00:00 2001 From: Zuul Date: Sat, 19 Jan 2019 18:06:01 +0000 Subject: [PATCH] Update git submodules * Update puppet-storyboard from branch 'master' - Merge "Use a utf8mb4 collation" - Use a utf8mb4 collation Change I25bd7b5d2a904dad3e13efaf2da94cce205bcc0b switched the characterset for new databases to utf8mb4, but the Puppet MySQL module independently defaults the collate parameter to utf_general_ci which is not compatible with utf8mb4. Set an explicit utf8mb4_general_ci collation instead so that the database can be created successfully. Change-Id: I9cc715e0b0cec9494489d56a2f4c1549782b0fca - Fix second ServerAdmin conditional There are two ServerAdmin entries in the https vhost erb template. One for port 80 and one for port 443. The previous change only fixed the issue for port 80. Fix this for port 443 too. Additionally fix the ssl chain file variable which has the same problem. Change-Id: Id3a36d1a3088f9ae08761f51f4073f388e2eedf8 - Fix undef in vhost templates On puppet 3 an explicit undef value is evaluated as the symbol :undef in ERB templates, while on puppet 4 the explicit undef is evaluated the same as the implicit undef which comes to the nil value in ERB. Check for both values to make both puppet versions happy. Change-Id: Ib4bff7259fea2722f799745d476d1af0c34408d5 - Set "AllowEncodedSlashes on" in vhost templates This is required to properly support handling requests for project by name, where the name may contain encoded slashes. For example, GET /v1/projects/openstack-infra%2Fstoryboard causes Apache to give a 404 error without this patch. Change-Id: Ibe95dbfc28621574bac7e4af78fe1d913fa4e1b6 - 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: Ieb08b1c3d5e9400657631a97fc4ce6ea8a5763e6 - Merge "Fix scope of vhost template variables" - Clean the webclient unpack dir safely. Don't rely on a puppet file resource to purge the unpack dir as this will trigger on every puppet run then copy the empty unpack dir to the deployment dir. Instead we call rm prior to tar during the unpack exec so that we only ever clean the dir if we are unpacking. Change-Id: I80b4faf54220d88e610e2a224dea47af4133e225 - Unpack webclient into dist subdir The old webclient tarballs had content in a "dist" subdirectory, but newer ones do not. So as to avoid webroot contamination as well as to make sure we copy the correct new content into place, unpack the tarballs into an empty "dist" subdirectory of the download staging directory. Change-Id: I15d1e00c9a0aa752b21b6eeedb29bcd89dc03935 - Fix Tarball Naming Storyboard.o.o's webclient has been lagging behind master due to a change in naming. This patch fixes the tarball name so that the webclient in prod will actually reflect whats in master. Change-Id: I35174ab8345fa811f21947c106dd3e18dc1bce0b - 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 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: I007975c920bd12a352acdea742b841a17ecc5d17 --- puppet-storyboard | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puppet-storyboard b/puppet-storyboard index 8fd663a697..aa7ec0ee06 160000 --- a/puppet-storyboard +++ b/puppet-storyboard @@ -1 +1 @@ -Subproject commit 8fd663a6978da53ad1dc6e26f7370f77be36e7a3 +Subproject commit aa7ec0ee06f45985a2f121a1e95b8d1d4343bd7b