summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2017-03-14 21:09:11 -0400
committerEmilien Macchi <emilien@redhat.com>2017-03-28 22:21:28 +0000
commit91053af09dace8dba65c9e5b72eb7de15fd69522 (patch)
treea6f588badd22243d0079b7db01bd0f629ea89881 /docker
parent06ec138699b0658b8d005ed900d24c9d72ac8ec7 (diff)
Allow to configure policy.json for OpenStack projects
For both containers and classic deployments, allow to configure policy.json for all OpenStack APIs with new parameters (hash, empty by default). Example of new parameter: NovaApiPolicies. See environments/nova-api-policy.yaml for how the feature can be used. Note: use it with extreme caution. Partial-implement: blueprint modify-policy-json Change-Id: I1144f339da3836c3e8c8ae4e5567afc4d1a83e95
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/docker-puppet.py4
-rw-r--r--docker/services/README.rst2
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py
index 8f95208f..eb647737 100755
--- a/docker/docker-puppet.py
+++ b/docker/docker-puppet.py
@@ -247,9 +247,9 @@ for config_volume in configs:
volumes = service[4] if len(service) > 4 else []
if puppet_tags:
- puppet_tags = "file,file_line,concat,%s" % puppet_tags
+ puppet_tags = "file,file_line,concat,augeas,%s" % puppet_tags
else:
- puppet_tags = "file,file_line,concat"
+ puppet_tags = "file,file_line,concat,augeas"
process_map.append([config_volume, puppet_tags, manifest, config_image, volumes])
diff --git a/docker/services/README.rst b/docker/services/README.rst
index 465e4abe..84ac842e 100644
--- a/docker/services/README.rst
+++ b/docker/services/README.rst
@@ -74,7 +74,7 @@ are re-asserted when applying latter ones.
* puppet_tags: Puppet resource tag names that are used to generate config
files with puppet. Only the named config resources are used to generate
a config file. Any service that specifies tags will have the default
- tags of 'file,concat,file_line' appended to the setting.
+ tags of 'file,concat,file_line,augeas' appended to the setting.
Example: keystone_config
* config_volume: The name of the volume (directory) where config files