Merge "Add network ExtraConfig hook"

diff --cc overcloud-resource-registry-puppet.yaml
index e1d9572,db28393..13d8e13
--- 1/overcloud-resource-registry-puppet.yaml
--- 2/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@@ -56,15 -55,19 +56,17 @@@ 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::ExtraConfig: network/extraconfig.yaml
+ 
    OS::TripleO::Network::Ports::NetVipMap: network/ports/net_ip_map.yaml
    OS::TripleO::Network::Ports::NetIpMap: network/ports/net_ip_map.yaml
 -  OS::TripleO::Network::Ports::NetIpSubnetMap: network/ports/net_ip_subnet_map.yaml
    OS::TripleO::Network::Ports::NetIpListMap: network/ports/net_ip_list_map.yaml
  
    # Port assignments for the VIPs