aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-resource-registry-puppet.j2.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-13 02:04:21 +0000
committerGerrit Code Review <review@openstack.org>2017-07-13 02:04:21 +0000
commitc76feac1a9d80c545330085c9928b6ff15f58096 (patch)
tree05e33a7e991d7ab94e82cd8fa28cdd45a951195d /overcloud-resource-registry-puppet.j2.yaml
parent25acb53ddfc15644b9803b66a5e2f8203ddc188c (diff)
parentd0acf566066126ef41f85dacf825ceb6e850cc62 (diff)
Merge "Add DeployedServerEnvironmentOutput"
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 9cf5b680..aaed2603 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -107,6 +107,8 @@ resource_registry:
# Upgrade resources
OS::TripleO::UpgradeConfig: puppet/upgrade_config.yaml
+ OS::TripleO::DeployedServerEnvironment: OS::Heat::None
+
# services
OS::TripleO::Services: services.yaml
OS::TripleO::Services::Apache: puppet/services/apache.yaml