summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-14 14:31:18 +0000
committerGerrit Code Review <review@openstack.org>2016-10-14 14:31:18 +0000
commit23dc0914e4d74edc38cd7d765fb3b6fa9dfab18e (patch)
tree40bf7f66fe044b023680ae87b597ad26a0a1610d
parent1753b19a08efa5d6d859cf9096acd014cb6b91c9 (diff)
parent3f842b5314d92999517f283232b5697ed2a5ca42 (diff)
Merge "Add contrail services to the resource registry"
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 1fb28128..218cd2d3 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -203,6 +203,11 @@ resource_registry:
OS::TripleO::Services::OpenDaylightApi: OS::Heat::None
OS::TripleO::Services::OpenDaylightOvs: OS::Heat::None
OS::TripleO::Services::SensuClient: OS::Heat::None
+ OS::TripleO::Services::ContrailAnalytics: puppet/services/network/contrail-analytics.yaml
+ OS::TripleO::Services::ContrailConfig: puppet/services/network/contrail-config.yaml
+ 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
parameter_defaults:
EnablePackageInstall: false