Merge "Add IronicPxe to the default controller" into stable/pike

[apex-tripleo-heat-templates.git] / environments / net-bond-with-vlans-no-external.yaml

diff --git a/environments/net-bond-with-vlans-no-external.yaml b/environments/net-bond-with-vlans-no-external.yaml
index 0da119d..cc27d4f 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
@@ -20,7 +20,3 @@ resource_registry:
   OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/bond-with-vlans/controller-no-external.yaml
   OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/swift-storage.yaml
   OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/ceph-storage.yaml
-
-# NOTE: with no external interface we should be able to use the
-# default Neutron l3_agent.ini setting for the external bridge (br-ex)
-# i.e. No need to set:  NeutronExternalNetworkBridge: "''"