Remove network/noop.yaml, use OS::Heat::None

Removes the old noop nested stack template for networks and
instead uses OS::Heat::None instead. This should avoid a few
extra resource checks on create and update.

Change-Id: Ia3d7f62dbda2705ffc3d9edcddebcd3ece3cc9d2

diff --git a/environments/net-bond-with-vlans-no-external.yaml b/environments/net-bond-with-vlans-no-external.yaml
index 0da119d..75959a0 100644 (file)
--- a/environments/net-bond-with-vlans-no-external.yaml
+++ b/environments/net-bond-with-vlans-no-external.yaml
@@ -12,7 +12,7 @@
 resource_registry:
 
   # Set external ports to noop
-  OS::TripleO::Network::External: ../network/noop.yaml
+  OS::TripleO::Network::External: OS::Heat::None
   OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/noop.yaml
 
   OS::TripleO::BlockStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/cinder-storage.yaml

diff --git a/environments/net-single-nic-with-vlans-no-external.yaml b/environments/net-single-nic-with-vlans-no-external.yaml
index a173df4..c7594b3 100644 (file)
--- a/environments/net-single-nic-with-vlans-no-external.yaml
+++ b/environments/net-single-nic-with-vlans-no-external.yaml
@@ -10,7 +10,7 @@
 resource_registry:
 
   # Set external ports to noop
-  OS::TripleO::Network::External: ../network/noop.yaml
+  OS::TripleO::Network::External: OS::Heat::None
   OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/noop.yaml
 
   # Configure other ports as normal

diff --git a/environments/network-isolation.yaml b/environments/network-isolation.yaml
index 87fc22f..c0420c5 100644 (file)
--- a/environments/network-isolation.yaml
+++ b/environments/network-isolation.yaml
@@ -10,7 +10,7 @@ resource_registry:
   OS::TripleO::Network::Storage: ../network/storage.yaml
   OS::TripleO::Network::Tenant: ../network/tenant.yaml
   # Management network is optional and disabled by default
-  OS::TripleO::Network::Management: ../network/noop.yaml
+  OS::TripleO::Network::Management: OS::Heat::None
 
   # Port assignments for the VIPs
   OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external.yaml

diff --git a/network/noop.yaml b/network/noop.yaml
deleted file mode 100644 (file)
index 0963d2c..0000000
--- a/network/noop.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-heat_template_version: 2015-04-30
-
-description: A stack which creates no network(s).

diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index bc3b724..cba0291 100644 (file)
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -56,13 +56,12 @@ 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::Ports::NetVipMap: network/ports/net_ip_map.yaml
   OS::TripleO::Network::Ports::NetIpMap: network/ports/net_ip_map.yaml