summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-02 18:47:35 +0000
committerGerrit Code Review <review@openstack.org>2017-03-02 18:47:35 +0000
commitb6c74c47aab63be17e2e6aeb39674ead879bba6a (patch)
tree40c46f732f7d41f736dee2d9635f089af878d62f
parente82e8d23abcfec94d2dbb633b2d5ecd136d4b201 (diff)
parente405a74048a50a2121c6d61db355dea21678aeec (diff)
Merge "Add plan-environment.yaml"
-rw-r--r--plan-environment.yaml5
-rw-r--r--releasenotes/notes/6.0.0-b52a14a71fc62788.yaml2
2 files changed, 7 insertions, 0 deletions
diff --git a/plan-environment.yaml b/plan-environment.yaml
new file mode 100644
index 00000000..f629eff3
--- /dev/null
+++ b/plan-environment.yaml
@@ -0,0 +1,5 @@
+version: 1.0
+
+template: overcloud.yaml
+environments:
+- path: overcloud-resource-registry-puppet.yaml
diff --git a/releasenotes/notes/6.0.0-b52a14a71fc62788.yaml b/releasenotes/notes/6.0.0-b52a14a71fc62788.yaml
index f9afb18d..9343d99e 100644
--- a/releasenotes/notes/6.0.0-b52a14a71fc62788.yaml
+++ b/releasenotes/notes/6.0.0-b52a14a71fc62788.yaml
@@ -64,6 +64,8 @@ features:
- Support for Octavia composable services for LBaaS with Neutron.
- Support for Collectd composable services for performance monitoring.
- Support for Tacker composable service for VNF management.
+ - Add the plan-environment.yaml file which will facilitate deployment plan
+ import and export.
upgrade:
- Update OpenDaylight deployment to use networking-odl v2 as a mechanism
driver.