Update git submodules

* Update puppet-meetbot 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: I809974db704f559e7de255479246ed1ab4243c34
    
  - Wait to join channels until identified by NickServ
    
    With all our channels mode +r these days, the first few the meetbot
    attempts to join are rejected while NickServ is still chewing on the
    identify command. Use the supybot configuration option to delay
    joining until we get identification confirmed.
    
    Change-Id: I0631cfbba46dfe3c23ff5e455f2ac941b5655c28
    
  - Merge "Use httpd::vhost $content parameter"
  - 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: I3d9b01fe25acb5887859fa65d8ca309ce4c965c8
    
  - Merge "Add beaker tests"
  - Merge "Fix template variables"
  - Merge "Fix $manage_index if statement"
  - 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
    most of 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. This also requires adjusting some of the
    template parameters that had previously been correctly scoped from the
    httpd::vhost defined type.
    
    Depends-On: https://review.openstack.org/570824
    
    Change-Id: I3a45e99e3355d1e59d57d3d989cc03d253529bf2
    
  - Add beaker tests
    
    Add functional tests to ensure that the meetbot module can be applied
    without errors, and that the service is accessible. It also validates
    that the vhost template renders as expected, since this tends to be one
    of the harder parts to get right in module development.
    
    Change-Id: I812a7503d0fda4823bbc0bb7b268f8287b2def8b
    
  - Fix template variables
    
    In the httpd module, serveraliases defaults to undef, which evaluates to
    nil in ERB templates. Ensure the template checks for nil values so that
    the ServerAlias line is only included if there is a server alias.
    
    Also correct the variable usage in the index.html.erb template.
    
    Change-Id: Ibde097b7dd407884336154a318ec4c5661fda03c
    
  - Fix $manage_index if statement
    
    Without this patch, with puppet 3, if the $manage_index variable is set,
    it is ignored, since the conditional compares the string 'manage_index'
    to the value 'true'. With puppet 4, this would cause a syntax error.
    
    Change-Id: If9dc13515059a2c148ddde3108b256feb3bc1298
This commit is contained in:
Ian Wienand 2019-03-24 20:35:41 +00:00 committed by Gerrit Code Review
parent e7507ea108
commit 0ee54e9cc7
1 changed files with 1 additions and 1 deletions

@ -1 +1 @@
Subproject commit 9cd6a4d6a03209aa75346d39c589c8511eb4c9c6
Subproject commit 6c5903c2bf2d1e8997193975a6de0878b0b1a21f