From 77b9423be07724782fef1d1a863535ad896a7f19 Mon Sep 17 00:00:00 2001 From: Zuul Date: Mon, 25 Mar 2019 16:57:39 +0000 Subject: [PATCH] Update git submodules * Update puppet-keystone from branch 'master' - Merge "Don't use proc in title patterns" - Don't use proc in title patterns Using a proc in type title patterns causes an error when generating puppet types for environment isolation. For example, running `puppet generate types` on a puppet master produces the following error: ``` Error: /etc/puppetlabs/code/environments/production/modules/keystone/lib/puppet/type/keystone_user_role.rb: title patterns that use procs are not supported. ``` This commit changes the `project_domain` parameter to always default to `DEFAULT_DOMAIN` even when using a `::@::` or `@::` title pattern. The only place I could find that utilized `project_domain` being unset was determining `keystone_domain` autorequires. The logic was updated to reflect that `project_domain` is either set or should use the default unless `domain` is set. Change-Id: Icd29c5aa89ae442ca69cad0411188162462bf6ff --- puppet-keystone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puppet-keystone b/puppet-keystone index 6114f198f0..e4507be6b0 160000 --- a/puppet-keystone +++ b/puppet-keystone @@ -1 +1 @@ -Subproject commit 6114f198f056b474d2b7e13ef2e34f285f0eb556 +Subproject commit e4507be6b0b74d5317a8b3baa03a00e3d2852dc0