summaryrefslogtreecommitdiffstats
path: root/docs/submodules/fuel
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2017-09-14 13:01:08 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-14 13:01:08 +0000
commit02f165b4b5504f19161260c5e1d402663ad37369 (patch)
tree43c0e56215e115d3ecdd91d04126294caaafe37b /docs/submodules/fuel
parent59ab9d6eac10eaf5717452a3396cecf23f42d400 (diff)
Update git submodules
* Update docs/submodules/releng from branch 'master' - Merge "[fuel] Handle os cacert for alpine as well" - [fuel] Handle os cacert for alpine as well Change-Id: Ie7e8228dc4316a70c8cd800415108180148f5f31 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'docs/submodules/fuel')
0 files changed, 0 insertions, 0 deletions
# nic3) and configures an IP address on each relevant isolated network # for each role, with IPv6 on the External network. This template assumes # use of network-isolation-v6.yaml. # # 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-v6.yaml. resource_registry: OS::TripleO::BlockStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/cinder-storage.yaml OS::TripleO::Compute::Net::SoftwareConfig: ../network/config/bond-with-vlans/compute.yaml OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/bond-with-vlans/controller-v6.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 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 # will plug into br-int instead of br-ex) NeutronExternalNetworkBridge: "''"