Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Introduce a UpgradeScriptDeliveryWorfklow as part of tripleo upgrades"
[apex-tripleo-heat-templates.git]
/
README.rst
diff --git
a/README.rst
b/README.rst
index
148a741
..
36f9fba
100644
(file)
--- a/
README.rst
+++ b/
README.rst
@@
-15,8
+15,7
@@
Features
The ability to deploy a multi-node, role based OpenStack deployment using
OpenStack Heat. Notable features include:
The ability to deploy a multi-node, role based OpenStack deployment using
OpenStack Heat. Notable features include:
- * Choice of deployment/configuration tooling: puppet, os-apply-config, and
- (soon) docker
+ * Choice of deployment/configuration tooling: puppet, (soon) docker
* Role based deployment: roles for the controller, compute, ceph, swift,
and cinder storage
* Role based deployment: roles for the controller, compute, ceph, swift,
and cinder storage
@@
-29,8
+28,6
@@
Directories
A description of the directory layout in TripleO Heat Templates.
A description of the directory layout in TripleO Heat Templates.
- * deprecated: contains templates that have been deprecated
-
* environments: contains heat environment files that can be used with -e
on the command like to enable features, etc.
* environments: contains heat environment files that can be used with -e
on the command like to enable features, etc.
@@
-45,11
+42,5
@@
A description of the directory layout in TripleO Heat Templates.
* puppet: templates mostly driven by configuration with puppet. To use these
templates you can use the overcloud-resource-registry-puppet.yaml.
* puppet: templates mostly driven by configuration with puppet. To use these
templates you can use the overcloud-resource-registry-puppet.yaml.
- * os-apply-config: templates mostly driven by configuration w/
- os-collect-config and bash based
- elements (which use the Heat os-apply-config group).
- These will soon be deprecated and are no longer part
- of the upstream CI testing efforts.
-
* validation-scripts: validation scripts useful to all deployment
configurations
* validation-scripts: validation scripts useful to all deployment
configurations