x/packstack
Code Issues Proposed changes

Remove Puppet templates endings when calling getManifestTemplate

Browse Source 
getManifestTemplate sets the default template ending 'pp' when not set
in the filename. It is not longer necessary to use the default template
ending when calling getManifestTemplate.

Change-Id: Ie0c487eef6196fe6276694d7973e943d42a59ae9
This commit is contained in:
Christian Berendt
2014-12-08 11:41:31 +01:00
committed by Martin Mágr
parent b073abede9
commit ebed2e6b92
16 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packstack/plugins/mariadb_003.py
View File

@@ -95,13 +95,13 @@ def create_manifest(config, messages):
host = config['CONFIG_CONTROLLER_HOST']
manifestfile = "%s_mariadb.pp" % host
manifestdata = [getManifestTemplate('mariadb_%s.pp' % suffix)]
manifestdata = [getManifestTemplate('mariadb_%s' % suffix)]
def append_for(module, suffix):
# Modules have to be appended to the existing mysql.pp
# otherwise pp will fail for some of them saying that
# Mysql::Config definition is missing.
template = "mariadb_%s_%s.pp" % (module, suffix)
template = "mariadb_%s_%s" % (module, suffix)
manifestdata.append(getManifestTemplate(template))
append_for("keystone", suffix)