From 07f5f07eea8d0917be9a05ae162a7f6a716beac2 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Sun, 24 Mar 2019 20:35:39 +0000
Subject: [PATCH] Update git submodules

* Update puppet-httpd 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: I76d1d384fd6c0f3ef6e765fa83fe02a060985b79

  - 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: I5a5c8613bf637f15d7a14481961991d242339d3c

  - Add content parameter to httpd::vhost

    Evaluating the template from the vhost defined type rather than the
    module where it originates causes problems when dereferencing the
    variables in the ERB file. If they are not accessed via the internal
    scope object, they can't be found when using puppet 4. The scope object
    is also useless when the variables are defined in a defined type and not
    a class.

    This patch adds a new parameter, $content, which overrides the $template
    parameter. If provided, $content indicates the literal string content
    for the vhost, as opposed to a reference to a template that needs to be
    rendered. This can be used like this:

      $content = template('example/example.vhost.erb')
      httpd::vhost { 'vhostname':
        content => $content,
        priority => 50
      }

    This way the template is evaluated when the template() function is
    called and has access to variables in that scope.

    Change-Id: Ibe3c609d92f3321f43f4794062a64b119b07a1d0
---
 puppet-httpd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/puppet-httpd b/puppet-httpd
index 9e47c78140..95f4cc9888 160000
--- a/puppet-httpd
+++ b/puppet-httpd
@@ -1 +1 @@
-Subproject commit 9e47c78140da15bc134ffaf7ee5922a78590c4e6
+Subproject commit 95f4cc98888ccdabeb8bef82e9a78306ea87f2c6