Merge "Replace extraconfig/tasks/noop.yaml w/ Heat::None"

diff --combined overcloud-resource-registry-puppet.yaml
index cba0291,be7285f..0dad115
--- 1/overcloud-resource-registry-puppet.yaml
--- 2/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@@ -23,10 -23,10 +23,10 @@@ resource_registry
    OS::TripleO::BootstrapNode::SoftwareConfig: puppet/bootstrap-config.yaml
  
    # Tasks (for internal TripleO usage)
-   OS::TripleO::Tasks::UpdateWorkflow: extraconfig/tasks/noop.yaml
+   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
@@@ -56,12 -56,13 +56,12 @@@
    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