aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-13 21:10:16 +0000
committerGerrit Code Review <review@openstack.org>2017-01-13 21:10:16 +0000
commitc646dc515d006acf0b8e39ee1b5f1a70e5ee6169 (patch)
tree79d2024b573410330622c5166b7b7fc433fbfc78
parentc571dba035599eaee887436882da6ff0992e0a3b (diff)
parent3f0a79cee8bd2ebf6112af7837456e2ec63ba98c (diff)
downloadkolla-c646dc515d006acf0b8e39ee1b5f1a70e5ee6169.tar.gz
kolla-c646dc515d006acf0b8e39ee1b5f1a70e5ee6169.zip
Merge "add template-override subdirectory to contrib and doc"
-rw-r--r--contrib/template-override/.keep0
-rw-r--r--doc/template-override/.keep0
-rw-r--r--releasenotes/notes/templete-override-files-c7489543d92d1811.yaml10
3 files changed, 10 insertions, 0 deletions
diff --git a/contrib/template-override/.keep b/contrib/template-override/.keep
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/contrib/template-override/.keep
diff --git a/doc/template-override/.keep b/doc/template-override/.keep
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/doc/template-override/.keep
diff --git a/releasenotes/notes/templete-override-files-c7489543d92d1811.yaml b/releasenotes/notes/templete-override-files-c7489543d92d1811.yaml
new file mode 100644
index 000000000..a574b4d64
--- /dev/null
+++ b/releasenotes/notes/templete-override-files-c7489543d92d1811.yaml
@@ -0,0 +1,10 @@
+---
+other:
+ - |
+ In the Ocata cycle, two new template-override subdirectories were added
+ to contrib and doc directory. template override files stored in the
+ contrib/template-override directory will not be gated and serve as an
+ example of how to extend in-tree container images for specific use cases
+ e.g. source build of infrastructure containers.
+ Templates stored in contrib/template-override should have to correspond
+ documentation in doc/template-override to describe their use.