x/packstack
Code Issues Proposed changes

Add symlink to support hiera >= 3.0

Browse Source 
Hiera versions >= 3.0 change the default hiera.yaml file, by using
"common.yaml" for the default hieradata file instead of
"defaults.yaml", as used before. Adding a symlink to support both
versions.

Change-Id: I074945fecea067dbb360ef252e07e87c90a4d390
Fixes: bz#1284978
This commit is contained in:
Javier Pena
2015-11-24 17:14:58 +01:00
parent dab52e4711
commit dc3e416cd7
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packstack/modules/ospluginutils.py
View File

@@ -25,6 +25,8 @@ controller = Controller()
PUPPET_DIR = os.path.join(basedefs.DIR_PROJECT_DIR, "puppet")
PUPPET_TEMPLATE_DIR = os.path.join(PUPPET_DIR, "templates")
HIERA_DEFAULTS_YAML = os.path.join(basedefs.HIERADATA_DIR, "defaults.yaml")
# For compatibility with hiera >= 3.0
HIERA_COMMON_YAML = os.path.join(basedefs.HIERADATA_DIR, "common.yaml")
class ManifestFiles(object):
@@ -80,6 +82,7 @@ def generateHieraDataFile():
outfile.write(yaml.dump(controller.CONF,
explicit_start=True,
default_flow_style=False))
os.symlink(HIERA_DEFAULTS_YAML, HIERA_COMMON_YAML)
def createFirewallResources(hiera_key, default_value='{}'):