Update git submodules
* Update puppet-nodepool from branch 'master' - Make builder ssl vhost futureparser safe The builder ssl vhost template looks up vars as if they are local. Problem is with futureparser and puppet4 these vars don't make it into the global scope so they aren't valid here. Instead we do explicit lookup of the values in the correct scope. Change-Id: I92a6533d47075d8dac404999a6e3b5c4ccea84ed - Merge "Increase timeout on nodepool install" - Add openstacksdk logging to nodepool builder Nodepool now uses openstacksdk in place of shade. Add a logger for that. Also, this makes the builder logging config look like the one in system-config which is, accidentally, the actual logging config being used right now. I'm going to put up another change to use the logging config in this repo, which is the correct thing to do for v3 of nodepool. Change-Id: I5e6ab0a34e9e5df0ee152b33b01e5266691e6fc6 - Update nodepool launcher logging We've moved from shade to openstacksdk. Change-Id: I13df848ac742a9c2a48b57ef128482bb24637767 - Merge "Fix name of libxslt dev package" - 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: Ic85e06a90f464e34df1d0ead6e2973926809b532 - Fix name of libxslt dev package `libxslt-dev` is the virtual package. Puppet can install it fine, but can't detect that it's already installed and will attempt to reinstall it on every run, breaking idempotency tests. Use the real name of the package, `libxslt1-dev`, to avoid this. This name is the same for Trusty, Xenial, and Bionic. Change-Id: If65865c5d895559f48db325b65f3e72445ef9d4b - Fix ssl template logic If we *have* a value for the ssl_cert_file, we want to use the SSL template. Change-Id: I470642d6308b4cb59deacf8b7c8e849d0a8efb0d - Fix ssl key lookup It seems the scope.lookupvar() doesn't work with non-global variables; use the @ syntax. This is copied from puppet-cgit Change-Id: I38eb50157d25c6c7900a8455eddedb4655c4637d - Add SSL support in builder We wish to export the build logs and artifacts via https; not so much for any security reasons but for transparent-proxy-busting effects. Add SSL arguments and a template that redirects 80->443 for hosts if they're passing in key contents. Change-Id: I8a15333a7c662f3d32fa4045785498dafc87ad53 - Increase timeout on nodepool install This can require building a few binary packages, which can take a while on a slower cloud. Increase timeout over default 300s Change-Id: I4b50c1af1f3fa4afb2f28e14f699fa8c3166e01e
This commit is contained in:
parent
fa281bcf77
commit
5e616d49f4
|
@ -1 +1 @@
|
|||
Subproject commit f4f63143975522a31d3cb18b5c2863a742232cf5
|
||||
Subproject commit 71fe2002e5dd32d3c97b4dcc0ec5558b09428bb7
|
Loading…
Reference in New Issue