Merge "Special case non-matching ObjectStorage role port names"

[apex-tripleo-heat-templates.git] / roles_data.yaml

diff --git a/roles_data.yaml b/roles_data.yaml
index 23f8af4..86d0e4f 100644 (file)
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -90,7 +90,8 @@
     - OS::TripleO::Services::NovaIronic
     - OS::TripleO::Services::TripleoPackages
     - OS::TripleO::Services::TripleoFirewall
-    - OS::TripleO::Services::OpenDaylight
+    - OS::TripleO::Services::OpenDaylightApi
+    - OS::TripleO::Services::OpenDaylightOvs
     - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::FluentdClient
     - OS::TripleO::Services::VipHosts
@@ -114,9 +115,7 @@
     - OS::TripleO::Services::ComputeNeutronL3Agent
     - OS::TripleO::Services::ComputeNeutronMetadataAgent
     - OS::TripleO::Services::TripleoPackages
-    # FIXME: This doesn't appear to have been enabled before
-    # so disabling it here until we can support it
-    #- OS::TripleO::Services::TripleoFirewall
+    - OS::TripleO::Services::TripleoFirewall
     - OS::TripleO::Services::NeutronSriovAgent
     - OS::TripleO::Services::OpenDaylightOvs
     - OS::TripleO::Services::SensuClient