diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-07 12:56:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-07 12:56:17 +0000 |
| commit | 98224f0b511f5387a64e1871f2142236ee1c7712 (patch) | |
| tree | 8dbb145b061a8dc880d65a9b436fd1afbd68f2a7 /environments/net-single-nic-linux-bridge-with-vlans.yaml | |
| parent | c97e6aa0b85d19d38144318c97a55babd260cf70 (diff) | |
| parent | 365c35cc6e1e588215ab6d63143b84bb56dce376 (diff) | |
Merge "Add IPv6 versions of the Controller NIC configs"
Diffstat (limited to 'environments/net-single-nic-linux-bridge-with-vlans.yaml')
| -rw-r--r-- | environments/net-single-nic-linux-bridge-with-vlans.yaml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/environments/net-single-nic-linux-bridge-with-vlans.yaml b/environments/net-single-nic-linux-bridge-with-vlans.yaml index d5f2ed62..fd80bb9b 100644 --- a/environments/net-single-nic-linux-bridge-with-vlans.yaml +++ b/environments/net-single-nic-linux-bridge-with-vlans.yaml @@ -12,10 +12,6 @@ resource_registry: OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/single-nic-linux-bridge-vlans/swift-storage.yaml OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/single-nic-linux-bridge-vlans/ceph-storage.yaml -# We use parameter_defaults instead of parameters here because Tuskar munges -# the names of top level and role level parameters with the role name and a -# version. Using parameter_defaults makes it such that if the parameter name is -# not defined in the template, we don't get an error. parameter_defaults: # This sets 'external_network_bridge' in l3_agent.ini to an empty string # so that external networks act like provider bridge networks (they |