summaryrefslogtreecommitdiff
path: root/hot/software-config
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-09-29 14:41:23 -0400
committerDan Prince <dprince@redhat.com>2016-10-05 21:29:02 -0400
commit40a4ed0841789b8980e3161bd18490fb8b4bca7e (patch)
tree3b56e6accfdfb162c195e62bd0623a38e805b643 /hot/software-config
parent7c5aae183aabb3129fc90c60ccdaf5c1f17dd6ba (diff)
downloadheat-templates-40a4ed0841789b8980e3161bd18490fb8b4bca7e.tar.gz
A hook which writes hiera datafiles.
This patch creates a hook that writes hiera.yaml and datafiles to disk. This approach works well for users (like TripleO) who prefer to maintain Hiera in a more composable manner with Heat structured config resources rather than specifying all the Hiera values for each puppet config resource. Partial-bug: #1596373 Change-Id: I21639f6aadabf9e49f40d1bb0b1d0edcfc4dbc5e
Diffstat (limited to 'hot/software-config')
-rw-r--r--hot/software-config/elements/heat-config-hiera/README.rst25
-rw-r--r--hot/software-config/elements/heat-config-hiera/element-deps1
-rwxr-xr-xhot/software-config/elements/heat-config-hiera/install.d/50-heat-config-hook-hiera9
-rwxr-xr-xhot/software-config/elements/heat-config-hiera/install.d/hook-hiera.py84
4 files changed, 119 insertions, 0 deletions
diff --git a/hot/software-config/elements/heat-config-hiera/README.rst b/hot/software-config/elements/heat-config-hiera/README.rst
new file mode 100644
index 0000000..89e9c83
--- /dev/null
+++ b/hot/software-config/elements/heat-config-hiera/README.rst
@@ -0,0 +1,25 @@
+A hook which helps write hiera files to disk and creates
+the hiera.yaml to order them. This is typically used alongside
+of the puppet hook to generate Hiera in a more composable manner.
+
+Example:
+
+ ComputeConfig:
+ type: OS::Heat::StructuredConfig
+ properties:
+ group: hiera
+ config:
+ hierarchy:
+ - compute
+ datafiles:
+ compute:
+ debug: true
+ db_connection: foo:/bar
+ # customized hiera goes here...
+
+This would write out:
+
+ 1) An /etc/hiera.yaml config file with compute in the hierarchy.
+
+ 2) An /etc/puppet/hieradata/compute.json file loaded with the
+ custom hiera data.
diff --git a/hot/software-config/elements/heat-config-hiera/element-deps b/hot/software-config/elements/heat-config-hiera/element-deps
new file mode 100644
index 0000000..31d7aa5
--- /dev/null
+++ b/hot/software-config/elements/heat-config-hiera/element-deps
@@ -0,0 +1 @@
+heat-config
diff --git a/hot/software-config/elements/heat-config-hiera/install.d/50-heat-config-hook-hiera b/hot/software-config/elements/heat-config-hiera/install.d/50-heat-config-hook-hiera
new file mode 100755
index 0000000..067e439
--- /dev/null
+++ b/hot/software-config/elements/heat-config-hiera/install.d/50-heat-config-hook-hiera
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -x
+
+SCRIPTDIR=$(dirname $0)
+
+install-packages hiera
+install -D -g root -o root -m 0755 ${SCRIPTDIR}/hook-hiera.py /var/lib/heat-config/hooks/hiera
+
+ln -f -s /etc/puppet/hiera.yaml /etc/hiera.yaml
diff --git a/hot/software-config/elements/heat-config-hiera/install.d/hook-hiera.py b/hot/software-config/elements/heat-config-hiera/install.d/hook-hiera.py
new file mode 100755
index 0000000..d8b9059
--- /dev/null
+++ b/hot/software-config/elements/heat-config-hiera/install.d/hook-hiera.py
@@ -0,0 +1,84 @@
+#!/usr/bin/env python
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import json
+import logging
+import os
+import sys
+
+
+HIERA_DATADIR = os.environ.get('HEAT_PUPPET_HIERA_DATADIR',
+ '/etc/puppet/hieradata')
+HIERA_CONFIG = os.environ.get('HEAT_HIERA_CONFIG', '/etc/puppet/hiera.yaml')
+
+HIERA_CONFIG_BASE = """
+---
+:backends:
+ - json
+:json:
+ :datadir: %(datadir)s
+:hierarchy:
+""" % {'datadir': HIERA_DATADIR}
+
+
+def prepare_dir(path):
+ if not os.path.isdir(path):
+ os.makedirs(path, 0o700)
+
+
+def main(argv=sys.argv):
+ log = logging.getLogger('heat-config')
+ handler = logging.StreamHandler(sys.stderr)
+ handler.setFormatter(
+ logging.Formatter(
+ '[%(asctime)s] (%(name)s) [%(levelname)s] %(message)s'))
+ log.addHandler(handler)
+ log.setLevel('DEBUG')
+
+ c = json.load(sys.stdin)['config']
+
+ prepare_dir(HIERA_DATADIR)
+
+ hiera_config_file = os.path.join(HIERA_CONFIG)
+
+ # allow the end user to order the hiera config as they wish
+ if 'hierarchy' in c:
+ with os.fdopen(os.open(hiera_config_file,
+ os.O_CREAT | os.O_TRUNC | os.O_WRONLY, 0o600),
+ 'w') as config_file:
+ config_file.write(HIERA_CONFIG_BASE)
+ for item in c['hierarchy']:
+ config_file.write(' - %s\n' % item)
+
+ # write out the datafiles as YAML
+ if 'datafiles' in c:
+ for name, data in c['datafiles'].iteritems():
+ hiera_data = os.path.join(HIERA_DATADIR, '%s.json' % name)
+ with os.fdopen(os.open(hiera_data,
+ os.O_CREAT | os.O_TRUNC | os.O_WRONLY,
+ 0o600),
+ 'w') as hiera_data_file:
+ json.dump(data, hiera_data_file, indent=4, sort_keys=True)
+
+ response = {
+ 'deploy_stdout': '',
+ 'deploy_stderr': '',
+ 'deploy_status_code': 0,
+ }
+
+ json.dump(response, sys.stdout)
+
+
+if __name__ == '__main__':
+ sys.exit(main(sys.argv))