openstack/tripleo-heat-templates
Code Issues Proposed changes

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

Browse Source 
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
This commit is contained in:
Dan Prince 2016-04-07 19:27:57 -04:00
parent 706c2fe4b6
commit c8ccfa299c
5 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/net-bond-with-vlans-no-external.yaml
View File

@ -12,7 +12,7 @@
resource_registry: resource_registry:
# Set external ports to noop # 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::Controller::Ports::ExternalPort: ../network/ports/noop.yaml
OS::TripleO::BlockStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/cinder-storage.yaml OS::TripleO::BlockStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/cinder-storage.yaml

2
environments/net-single-nic-with-vlans-no-external.yaml
View File

@ -10,7 +10,7 @@
resource_registry: resource_registry:
# Set external ports to noop # 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::Controller::Ports::ExternalPort: ../network/ports/noop.yaml
# Configure other ports as normal # Configure other ports as normal

2
environments/network-isolation.yaml
View File

@ -10,7 +10,7 @@ resource_registry:
OS::TripleO::Network::Storage: ../network/storage.yaml OS::TripleO::Network::Storage: ../network/storage.yaml
OS::TripleO::Network::Tenant: ../network/tenant.yaml OS::TripleO::Network::Tenant: ../network/tenant.yaml
# Management network is optional and disabled by default # 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 # Port assignments for the VIPs
OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external.yaml OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external.yaml

3
network/noop.yaml
View File

@ -1,3 +0,0 @@
heat_template_version: 2015-04-30
description: A stack which creates no network(s).

13
overcloud-resource-registry-puppet.yaml
View File

@ -56,13 +56,12 @@ resource_registry:
OS::TripleO::Network: network/networks.yaml OS::TripleO::Network: network/networks.yaml
OS::TripleO::VipConfig: puppet/vip-config.yaml OS::TripleO::VipConfig: puppet/vip-config.yaml
OS::TripleO::Network::External: OS::Heat::None
OS::TripleO::Network::External: network/noop.yaml OS::TripleO::Network::InternalApi: OS::Heat::None
OS::TripleO::Network::InternalApi: network/noop.yaml OS::TripleO::Network::StorageMgmt: OS::Heat::None
OS::TripleO::Network::StorageMgmt: network/noop.yaml OS::TripleO::Network::Storage: OS::Heat::None
OS::TripleO::Network::Storage: network/noop.yaml OS::TripleO::Network::Tenant: OS::Heat::None
OS::TripleO::Network::Tenant: network/noop.yaml OS::TripleO::Network::Management: OS::Heat::None
OS::TripleO::Network::Management: network/noop.yaml
OS::TripleO::Network::Ports::NetVipMap: network/ports/net_ip_map.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::NetIpMap: network/ports/net_ip_map.yaml