openstack
/
openstack
Code Issues Proposed changes

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
This commit is contained in:
Zuul 2019-04-09 03:44:14 +00:00 committed by Gerrit Code Review
parent a3287320f5
commit f55426d048
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system-config

@ -1 +1 @@
Subproject commit 534f1b368dbb56529f5b2af04442380f598156af
Subproject commit 713b98298e04fba336f5eecf6b070b245dc996ed