fuel, docs: fuel-menu: Align defaults with OPNFV

[armband.git] / patches / opnfv-fuel / upstream-backports / 0004-Fuel-rework-for-multiple-libvirt.patch

diff --git a/patches/opnfv-fuel/upstream-backports/0004-Fuel-rework-for-multiple-libvirt.patch b/patches/opnfv-fuel/upstream-backports/0004-Fuel-rework-for-multiple-libvirt.patch
index 271e0fa..e9c8e2c 100644 (file)
--- a/patches/opnfv-fuel/upstream-backports/0004-Fuel-rework-for-multiple-libvirt.patch
+++ b/patches/opnfv-fuel/upstream-backports/0004-Fuel-rework-for-multiple-libvirt.patch
@@ -1,3 +1,11 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2017 Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 From: cristinapauna <cristina.pauna@enea.com>
 Date: Fri, 25 Nov 2016 16:38:46 +0200
 Subject: [PATCH] Fuel rework for multiple libvirt
@@ -736,7 +744,7 @@ index 3dd5f84..d738154 100644
 @@ -41,17 +41,42 @@ dea-override-config:
    - id: 1
      interfaces: interfaces_1
-     role: mongo,controller
+     role: mongo,controller,congress
 +    transformations: transformations_1
    - id: 2
      interfaces: interfaces_1
@@ -940,7 +948,7 @@ diff --git a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/no
 index 6f21ea2..e92a741 100644
 --- a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
 +++ b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
-@@ -60,17 +60,42 @@ dea-override-config:
+@@ -60,22 +60,47 @@ dea-override-config:
    - id: 1
      interfaces: interfaces_1
      role: mongo,controller
@@ -957,6 +965,11 @@ index 6f21ea2..e92a741 100644
      interfaces: interfaces_1
      role: ceph-osd,compute
 +    transformations: transformations_2
+   settings:
+     editable:
+       public_network_assignment:
+         assign_to_all_nodes:
+           value: true
  
  dha-override-config:
 + nodes: