From f55426d048d4654353b19e3587165fc271935696 Mon Sep 17 00:00:00 2001 From: Zuul Date: Tue, 9 Apr 2019 03:44:14 +0000 Subject: [PATCH] Update git submodules * Update system-config from branch 'master' - Merge "Don't manage puppet.conf during puppet-install" - Don't manage puppet.conf during puppet-install The ansible-role-puppet role manages puppet.conf for us. These two roles are currently fighting each other over the presence of the server line in puppet.conf. Avoid this by removing the removal of this line and the templatedir line from the new puppet-install role since ansible-role-puppet was there first. Basically just trust ansible-role-puppet to write a working puppet.conf for us. Change-Id: Ifb1dff31a61071bd867d3a7cc3cbcc496177e3ce --- system-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system-config b/system-config index 534f1b368d..713b98298e 160000 --- a/system-config +++ b/system-config @@ -1 +1 @@ -Subproject commit 534f1b368dbb56529f5b2af04442380f598156af +Subproject commit 713b98298e04fba336f5eecf6b070b245dc996ed