From da308a26be26469c53203520631c89a734e5c876 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Sat, 25 Jun 2016 09:00:56 +0100 Subject: Convert noop NetworkExtraConfig to OS::Heat::None This avoids creating an empty nested stack. Change-Id: Icce0bfab005a69fce42f58956dcc81acea805e74 --- network/extraconfig.yaml | 3 --- overcloud-resource-registry-puppet.yaml | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 network/extraconfig.yaml 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 -- cgit 1.2.3-korg