Convert noop NetworkExtraConfig to OS::Heat::None

This avoids creating an empty nested stack.

Change-Id: Icce0bfab005a69fce42f58956dcc81acea805e74

diff --git a/network/extraconfig.yaml b/network/extraconfig.yaml
deleted file mode 100644 (file)
index 93c6609..0000000
--- a/network/extraconfig.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-heat_template_version: 2015-04-30
-
-description: Noop network extra config

diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index 13d8e13..a87ff0e 100644 (file)
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -63,7 +63,7 @@ resource_registry:
   OS::TripleO::Network::Tenant: OS::Heat::None
   OS::TripleO::Network::Management: OS::Heat::None
 
-  OS::TripleO::Network::ExtraConfig: network/extraconfig.yaml
+  OS::TripleO::Network::ExtraConfig: 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