openstack
/
openstack
Code Issues Proposed changes

Update git submodules 

* Update puppet-kibana 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: I27d612e447f6b8495e96c5b307e2a7160581a2fa
    
  - Use full lookup path for serveradmin in template
    
    The last change was incomplete bceause we evaluate the apache conf
    template in the context of the httpd class meaning any vars outside of
    that class must be fully qualified lookups. Make serveradmin a fully
    qualified lookup.
    
    Change-Id: I709af6a78316cd1ca7e489d62f13e988997f3157
    
  - Set server admin var so that vhost works
    
    Using the puppet 4 future parser it is far more particular about
    variables and their scoping. We don't set a serveradmin in this class
    but then attempt to use it in the vhost template. This was fine under
    puppet 3 as it would just look for this out of the current scope but
    breaks under puppet 4.
    
    Make this trivially happy on puppet 4 by setting a default that is sane.
    
    Change-Id: Id415056cdfa693fd199e0b4a0c6b09e20faf23ef
    
  - Merge "Fix template variables"
  - Fix template variables
    
    When serveraliases is not defined it should evaluate to nil, not ''.
    Check for both to cover our bases.
    
    Change-Id: Ie69baf01963f33cf695a0de763af75dc33b67daa
    
  - 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: Ie3b3ae2d157b52f0b1ab36a8906642abd2a85ec3
    
  - Merge "Fix scope of vhost template variables"
  - 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
    kibana::js class 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: I27a63e74bda27269145b58e6d237c440085f0709
This commit is contained in:
Ian Wienand 2019-03-24 20:35:40 +00:00 committed by Gerrit Code Review
parent f892fec315
commit 25ed8fe40e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet-kibana

@ -1 +1 @@
Subproject commit efba033351d6a8274e7eec6a064e68d3150a78c4
Subproject commit 7d24a8209dfb34709837aa9bf341c7946637ca58