Enable Cinder as a backend for Glance

[apex-tripleo-heat-templates.git] / environments / net-single-nic-with-vlans-no-external.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..65d3813 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
@@ -19,7 +19,3 @@ resource_registry:
   OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/single-nic-vlans/controller-no-external.yaml
   OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/single-nic-vlans/swift-storage.yaml
   OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/single-nic-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: "''"