summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2016-06-25 09:00:56 +0100
committerSteven Hardy <shardy@redhat.com>2016-06-25 09:01:58 +0100
commitda308a26be26469c53203520631c89a734e5c876 (patch)
treeb53a569235181f7ffaed94db0a46c49e570f8689
parent749d24ec9d6d6c3d0198a287bd7adebca263d7b3 (diff)
Convert noop NetworkExtraConfig to OS::Heat::None
This avoids creating an empty nested stack. Change-Id: Icce0bfab005a69fce42f58956dcc81acea805e74
-rw-r--r--network/extraconfig.yaml3
-rw-r--r--overcloud-resource-registry-puppet.yaml2
2 files changed, 1 insertions, 4 deletions
diff --git a/network/extraconfig.yaml b/network/extraconfig.yaml
deleted file mode 100644
index 93c6609f..00000000
--- 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 13d8e13d..a87ff0ef 100644
--- 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