openstack
/
openstack
Code Issues Proposed changes

Update git submodules 

* Update puppet-drupal from branch 'master'
  - Be more forgiving about module dep versions
    
    As time has gone on we've updated module versions in our global module
    list making the pinned versions in this module inaccurate. Be more
    forgiving so that we can update modules as needed without raising
    warnings.
    
    Change-Id: I77f0b9a541710236bcfed3b3c78b94d101152bc1
    
  - Monkey-patch drush module for puppet 4
    
    The puppet-drush module that the puppet-drupal module depends on has
    some quirks on puppet 4. First, with the new ordering algorithm, it's
    not guaranteed that the drush repo and the composer installation will
    happen in the same order as before. We can fix that without touching the
    drush module itself by creating resource orderings from the
    drupal::drush class. Second, on puppet 3 the empty string '' was
    interpreted as falsey, so you could expect `if '' {}` to evaluate as
    false. On puppet 4, it's interpreted as truthy, and for the drush module
    using '' as the default for the git_tag parameter causes the drush
    $git_ref variable to be set to the empty string which causes the module
    to stay on the master branch instead of checking out the 6.x branch.
    There's no semantic difference between the git_branch and git_tag
    parameter, so we'll just set git_tag to the same as git_branch.
    
    Change-Id: I3acbda4edd546b4f145c9991f18ca80bb3e2171e
    
  - Fix template variable
    
    Since the chain file contents parameter defaults to undef, on puppet 3
    the ERB template evaluates that to the symbol :undef which is not
    falsey, so if it is left unset it creates an invalid apache config
    pointing to /etc/apache2/undef. To be safe, explicitly check for any
    emptyish values. This is only an issue for tests on puppet 3, on puppet
    4 undef is correctly evaluated as nil.
    
    Change-Id: I380d69f3928e342562c3c63e35a07555163733e8
    
  - Fix template variables
    
    When serveraliases is not defined it should evaluate to nil, not ''.
    Check for both to cover our bases.
    
    Change-Id: Iad51146400443fce963889d77eae3c6e4759d08c
    
  - 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: Ifa3b018bf367540dd25d732b2fb5a561df47ce46
    
  - 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
    manifest 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: Ifc1db7851d2a0cd39af9f05b55ec9a546a12f567
This commit is contained in:
Clark Boylan 2019-03-07 09:01:11 -08:00 committed by Gerrit Code Review
parent 7d326edd6b
commit b9ed7ff6f6
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-drupal

@ -1 +1 @@
Subproject commit 26bb0c054ba242117824f462cd40a733510b051a
Subproject commit 5f7d13495c497c4f99587d223da3a2e334c5f25f