diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-23 15:21:36 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-04-23 15:21:36 +0000 |
commit | 0885725346d5339b4e00f8cdfa7899a56f680c3b (patch) | |
tree | 467a1071557fd7d627759b8bc0c0b930dd2ea7c7 /docker/Dockerfile | |
parent | 6adff6a127a5b0caf2ebbb310e9b71bc32109a96 (diff) |
Update git submodules
* Update docs/submodules/fuel from branch 'stable/fraser'
- Merge "[ha] Fix tenant NIC OS config for VLAN ranges" into stable/fraser
- [ha] Fix tenant NIC OS config for VLAN ranges
Previous commits added support for tenant VLAN range parametrization,
yet failed to accomodate the new VLAN range representation ('M:N') in
existing `linux.network.interfaces` reclass configuration.
This lead to the silent removal of <nic_private>.<vlan_private> from
interfaces file and for `br-mesh` to try to use <nic_private> instead
of <nic_private>.<vlan_private>, conflicting with `br-floating`.
Stick to using the first VLAN in the tenant range.
JIRA: FUEL-365
Change-Id: I88f7263159f1742dba3b6e36649c9344f2932c5f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit cfc5988be48d1317244e71fd7919480db18745d4)
Diffstat (limited to 'docker/Dockerfile')
0 files changed, 0 insertions, 0 deletions