Merge "Upgrade scripts to migrate aodh alarm data"

[apex-tripleo-heat-templates.git] / overcloud-resource-registry-puppet.yaml

diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index 3d7da47..4d31b69 100644 (file)
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -134,6 +134,7 @@ resource_registry:
   OS::TripleO::Services::CephClient: OS::Heat::None
   OS::TripleO::Services::CephExternal: OS::Heat::None
   OS::TripleO::Services::CinderApi: puppet/services/cinder-api.yaml
+  OS::TripleO::Services::CinderBackup: puppet/services/cinder-backup.yaml
   OS::TripleO::Services::CinderScheduler: puppet/services/cinder-scheduler.yaml
   OS::TripleO::Services::CinderVolume: puppet/services/cinder-volume.yaml
   OS::TripleO::Services::Core: OS::Heat::None
@@ -144,8 +145,6 @@ resource_registry:
   OS::TripleO::Services::HeatApiCfn: puppet/services/heat-api-cfn.yaml
   OS::TripleO::Services::HeatApiCloudwatch: puppet/services/heat-api-cloudwatch.yaml
   OS::TripleO::Services::HeatEngine: puppet/services/heat-engine.yaml
-  OS::TripleO::Services::IronicApi: puppet/services/ironic-api.yaml
-  OS::TripleO::Services::IronicConductor: puppet/services/ironic-conductor.yaml
   OS::TripleO::Services::Kernel: puppet/services/kernel.yaml
   OS::TripleO::Services::MySQL: puppet/services/database/mysql.yaml
   OS::TripleO::Services::NeutronDhcpAgent: puppet/services/neutron-dhcp.yaml
@@ -212,6 +211,11 @@ resource_registry:
   OS::TripleO::Services::MistralEngine: OS::Heat::None
   OS::TripleO::Services::MistralApi: OS::Heat::None
   OS::TripleO::Services::MistralExecutor: OS::Heat::None
+  OS::TripleO::Services::IronicApi: OS::Heat::None
+  OS::TripleO::Services::IronicConductor: OS::Heat::None
+  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
 
 parameter_defaults:
   EnablePackageInstall: false