aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-resource-registry-puppet.j2.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-02 12:08:37 +0000
committerGerrit Code Review <review@openstack.org>2016-12-02 12:08:37 +0000
commit21303cd9fc8322bb505d5c5d6e5559b7aeedcce1 (patch)
tree355babbd7d9c72057ad078f6506656d7d05418e2 /overcloud-resource-registry-puppet.j2.yaml
parentcefb448de51186b2c9ec2e37715e668fc526ee3b (diff)
parent20f8fd1c382287ca98619c0e2f441d57af6e91ab (diff)
Merge "Composable Zaqar services"
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 21013bdc..77a48658 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -219,6 +219,7 @@ resource_registry:
OS::TripleO::Services::ContrailControl: puppet/services/network/contrail-control.yaml
OS::TripleO::Services::ContrailDatabase: puppet/services/network/contrail-database.yaml
OS::TripleO::Services::ContrailWebui: puppet/services/network/contrail-webui.yaml
+ OS::TripleO::Services::Zaqar: OS::Heat::None
parameter_defaults:
EnablePackageInstall: false