aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Slagle <jslagle@redhat.com>2017-06-27 12:48:59 -0400
committerMartin André <m.andre@redhat.com>2017-06-30 08:14:51 +0200
commit1847a014232afa726d01b3f75f46eec7b5444a45 (patch)
tree1e41dc9004a8a4e76ffe350ad6ba4d353a956dc5
parenta396ac325af8950acb18227f1a6a487159776020 (diff)
Allow volumes in puppet_config containers spec
Mounting host volumes when running containers via puppet_config already works and is supported with docker-puppet.py. However, the validation in yaml-validate.py does not allow it. This patch makes it allowed by the validation. It is sometimes necessary since some puppet modules expect to make persistent file system changes other than just configuration data under /etc. In particular, ironic inspector expects to configure a http and tftp root director with an ipxe configuration. See: https://github.com/openstack/puppet-ironic/blob/master/manifests/inspector.pp These changes would be lost if the value for those directories are not mounted as host volumes. Change-Id: Ie51c653f4c666fbaaef0ea80990e2e61f4b1353b
-rwxr-xr-xtools/yaml-validate.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index 233ec185..d9eebae4 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -38,7 +38,7 @@ OPTIONAL_DOCKER_SECTIONS = ['docker_puppet_tasks', 'upgrade_tasks',
'metadata_settings', 'kolla_config']
REQUIRED_DOCKER_PUPPET_CONFIG_SECTIONS = ['config_volume', 'step_config',
'config_image']
-OPTIONAL_DOCKER_PUPPET_CONFIG_SECTIONS = [ 'puppet_tags' ]
+OPTIONAL_DOCKER_PUPPET_CONFIG_SECTIONS = [ 'puppet_tags', 'volumes' ]
# Mapping of parameter names to a list of the fields we should _not_ enforce
# consistency across files on. This should only contain parameters whose
# definition we cannot change for backwards compatibility reasons. New