diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-11-16 14:05:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-11-16 14:05:41 +0000 |
| commit | 415d57b79b28b2c260d263e70be81b987ced7933 (patch) | |
| tree | fbdf62c025d738f1bf1c92d2bdd24b3bf7aecd7a /environments/net-single-nic-with-vlans-no-external.yaml | |
| parent | 5bd3bc193f35580fdef0ae0fba991a7dd06996b1 (diff) | |
| parent | 58349641541cc0e3b502311344d290c2afde7da5 (diff) | |
Merge "Support network isolation without external nets"
Diffstat (limited to 'environments/net-single-nic-with-vlans-no-external.yaml')
| -rw-r--r-- | environments/net-single-nic-with-vlans-no-external.yaml | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/environments/net-single-nic-with-vlans-no-external.yaml b/environments/net-single-nic-with-vlans-no-external.yaml new file mode 100644 index 00000000..a173df4e --- /dev/null +++ b/environments/net-single-nic-with-vlans-no-external.yaml @@ -0,0 +1,25 @@ +# This template configures each role to use Vlans on a single nic for +# each isolated network. +# This template assumes use of network-isolation.yaml and should be specified +# last on the CLI as a Heat environment so as to override specific +# registry settings in the network-isolation registry. +# +# FIXME: if/when we add functionality to heatclient to include heat +# environment files we should think about using it here to automatically +# include network-isolation.yaml. +resource_registry: + + # Set external ports to noop + OS::TripleO::Network::External: ../network/noop.yaml + OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/noop.yaml + + # Configure other ports as normal + OS::TripleO::BlockStorage::Net::SoftwareConfig: ../network/config/single-nic-vlans/cinder-storage.yaml + OS::TripleO::Compute::Net::SoftwareConfig: ../network/config/single-nic-vlans/compute.yaml + 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: "''" |