mirror of
https://opendev.org/openstack/openstack.git
synced 2026-01-16 23:02:00 +00:00
Update git submodules
* Update puppet-cgit from branch 'master'
- Replace openstack.org git:// URLs with https://
This is a mechanically generated change to replace openstack.org
git:// URLs with https:// equivalents.
This is in aid of a planned future move of the git hosting
infrastructure to a self-hosted instance of gitea (https://gitea.io),
which does not support the git wire protocol at this stage.
This update should result in no functional change.
For more information see the thread at
http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003825.html
Change-Id: I8f5c94b34373cb0cc7696e0a19168db186e8164e
- Merge "Update Gemfile for Zuulv3"
- Merge "Filter out link-local ipv6 address in loadbalancer"
- Filter out link-local ipv6 address in loadbalancer
On puppet 3, which uses facter 2, the $::ipaddress6 fact explicitly
filters out all link-local address[1]. On puppet 4, which uses facter 3,
the $::ipaddress6 fact only removes the link-local address if can find a
better one[2]. The beaker tests reveal that haproxy won't bind to the
ipv6 local address and will fail to start, with errors like:
Starting proxy balance_git_daemon: cannot bind socket [fe80::5054:ff:fec5:7095:9418]
This matters in CI test cases where the test nodes don't have real ipv6
addresses.
This patch restores the puppet 3 behavior of ignoring the ipv6 address if
it's a link-local address.
[1] https://github.com/puppetlabs/facter/blob/2.x/lib/facter/ipaddress6.rb#L31
[2] https://docs.puppet.com/facter/3.1/release_notes.html#regression-fix-avoid-reporting-link-local-ipv6-addresses-if-a-valid-address-is-available
Change-Id: I481403a3a988211effd22c8524171379aea9ccf9
- Merge "Use httpd::vhost $content parameter"
- Merge "Add beaker check of vhost template"
- Merge "Add order to cgit 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: I353507114874a03fe7b11599e1186bca31fb2e3f
Depends-On: https://review.openstack.org/481943
Depends-On: https://review.openstack.org/575698
Depends-On: https://review.openstack.org/570825
Depends-On: https://review.openstack.org/575852
Depends-On: https://review.openstack.org/576262
- Add order to cgit package
The httpd module uses the file resource with the purge option to clear
out the httpd conf directory. On puppet 4, the resource ordering
algorithm changed such that the directory purge happens before the cgit
RPM adds a config file there, which means on the next puppet run it
purges it again and bounces the service again. This cause the
idempotency test in beaker to fail.
This patch adds an ordering parameter to ensure that the cgit package is
installed before the httpd class runs so that it doesn't have to clear
out the httpd config directory twice. Since puppet 4 more or less tries
to order resources in the order they appear, also swap the package
resourcs and httpd class just to make it clear what order things should
be in.
Change-Id: I813f6e9f82d3b44b1d38fb5773c5bd6160f58b78
- Use httpd::vhost $content parameter
Use the new $content parameter of httpd::vhost instead of $template.
This way, the template gets rendered within the scope where it assumes
its variables are, and doesn't need to use the scope object which
doesn't work within a defined type. This will ensure the template keeps
working on puppet 4.
Depends-On: https://review.openstack.org/570824
Change-Id: I8458c930e48c4c0b60e9b4cadd528a2dc899bb7d
- Add beaker check of vhost template
A subsequent patch will change how the the cgit apache vhost will be
defined, so add tests now to ensure that the future change produces
identical config files.
Change-Id: Ib8c1c3c63b52a6ea90bf25222fe0dba6936409da
- Reduce vhost priority on default site
Multiple vhosts with ssl/tls requires clients support SNI. Unfortunately
older python2 does not. There are workarounds but in an attempt to
influence vhost ordering for non SNI clients reduce the default vhost
priority on the default site vhost.
Change-Id: If0b6dc5f5647f8da48711c740ada4729283f74dc
This commit is contained in:
parent
74dc2c0b23
commit
03a6da110b
1 changed files with 1 additions and 1 deletions
|
|
@ -1 +1 @@
|
|||
Subproject commit 55c432baf6ec5b6ee502e0e88ca182fd4689bb47
|
||||
Subproject commit ff79f6a7906378d35c02634bb72a80c12db242a7
|
||||
Loading…
Add table
Reference in a new issue