aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-resource-registry-puppet.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-26 21:26:17 +0000
committerGerrit Code Review <review@openstack.org>2016-08-26 21:26:17 +0000
commitd7fe85b77e17767a21348a711da41b658a4ab1c5 (patch)
tree9caf4a1d72f9d1943849fc34b09fe0af3e271f12 /overcloud-resource-registry-puppet.yaml
parent3d69ec50675969a3dd624ece09af94ceee75cf30 (diff)
parent783975c72ca91486eb18a254591c964e93c60403 (diff)
Merge "Adds OpenDaylight composable service"
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
-rw-r--r--overcloud-resource-registry-puppet.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index 008f42f7..57399210 100644
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -220,6 +220,8 @@ resource_registry:
OS::TripleO::Services::NovaIronic: OS::Heat::None
OS::TripleO::Services::TripleoPackages: puppet/services/tripleo-packages.yaml
OS::TripleO::Services::TripleoFirewall: puppet/services/tripleo-firewall.yaml
+ OS::TripleO::Services::OpenDaylight: OS::Heat::None
+ OS::TripleO::Services::OpenDaylightOvs: OS::Heat::None
parameter_defaults:
EnablePackageInstall: false