aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-resource-registry-puppet.j2.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-01 16:47:37 +0000
committerGerrit Code Review <review@openstack.org>2016-12-01 16:47:37 +0000
commit1de7c229eae2c0427da9bf58f5ac0d38c23addcc (patch)
treeadfc8304c80916fe6bc13dfb532a438e6aefa986 /overcloud-resource-registry-puppet.j2.yaml
parentda9a90e8b8d76e09c44cc800dd243e3c2c5ef136 (diff)
parentdbece39f549395c85701566edbff9fc19977665d (diff)
Merge "Initial support for composable upgrades with Heat+Ansible"
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 30b9f2b9..21013bdc 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -100,6 +100,10 @@ resource_registry:
# validation resources
OS::TripleO::AllNodes::Validation: all-nodes-validation.yaml
+ # Upgrade resources
+ OS::TripleO::UpgradeConfig: puppet/upgrade_config.yaml
+ OS::TripleO::UpgradeSteps: OS::Heat::None
+
# services
OS::TripleO::Services: puppet/services/services.yaml
OS::TripleO::Services::Apache: puppet/services/apache.yaml