Retain existing ComputeHostnameFormat when upgrading older envs

[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 2601369..55cefc7 100644 (file)
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -23,9 +23,10 @@ resource_registry:
   OS::TripleO::BootstrapNode::SoftwareConfig: puppet/bootstrap-config.yaml
 
   # Tasks (for internal TripleO usage)
+  OS::TripleO::Tasks::UpdateWorkflow: OS::Heat::None
   OS::TripleO::Tasks::PackageUpdate: extraconfig/tasks/yum_update.yaml
-  OS::TripleO::Tasks::ControllerPrePuppet: extraconfig/tasks/noop.yaml
-  OS::TripleO::Tasks::ControllerPostPuppet: extraconfig/tasks/noop.yaml
+  OS::TripleO::Tasks::ControllerPrePuppet: OS::Heat::None
+  OS::TripleO::Tasks::ControllerPostPuppet: OS::Heat::None
 
   # This creates the "heat-admin" user for all OS images by default
   # To disable, replace with firstboot/userdata_default.yaml
@@ -55,13 +56,12 @@ resource_registry:
   OS::TripleO::Network: network/networks.yaml
   OS::TripleO::VipConfig: puppet/vip-config.yaml
 
-
-  OS::TripleO::Network::External: network/noop.yaml
-  OS::TripleO::Network::InternalApi: network/noop.yaml
-  OS::TripleO::Network::StorageMgmt: network/noop.yaml
-  OS::TripleO::Network::Storage: network/noop.yaml
-  OS::TripleO::Network::Tenant: network/noop.yaml
-  OS::TripleO::Network::Management: network/noop.yaml
+  OS::TripleO::Network::External: OS::Heat::None
+  OS::TripleO::Network::InternalApi: OS::Heat::None
+  OS::TripleO::Network::StorageMgmt: OS::Heat::None
+  OS::TripleO::Network::Storage: OS::Heat::None
+  OS::TripleO::Network::Tenant: OS::Heat::None
+  OS::TripleO::Network::Management: OS::Heat::None
 
   OS::TripleO::Network::Ports::NetVipMap: network/ports/net_ip_map.yaml
   OS::TripleO::Network::Ports::NetIpMap: network/ports/net_ip_map.yaml
@@ -121,6 +121,10 @@ resource_registry:
   # validation resources
   OS::TripleO::AllNodes::Validation: all-nodes-validation.yaml
 
+  # services
+  OS::TripleO::Services: puppet/services/services.yaml
+  OS::TripleO::Services::Keystone: puppet/services/keystone.yaml
+
 parameter_defaults:
   EnablePackageInstall: false
   SoftwareConfigTransport: POLL_TEMP_URL