aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-07-18 19:19:46 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-07-26 20:07:57 +0200
commitf07754a88c17467036b9b0c92a6560eceb7bcd8e (patch)
treec90f7122d393e3e4fa6c9264b9095c3e09163285 /patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch
parent94466c5acd31c3acd7b473bc4972693782582fef (diff)
p/fuel: network: public: Use arm-virtual2 POD cfg
FIXME: This should be converted into a dynamic configuration read from the universal POD descriptor in securedlab, once that is ready. Until then, just align the public network configuration used by the virtual POD with the Enea lab configuration specific to arm-virtual2 (i.e. public network on 10.0.9.0/24). NOTE: Replace the gateway at 10.16.0.1 (now 10.0.9.1) with the same IP address as our lab's gateway (10.0.9.254), to keep both possible network layouts in sync (using all virtual networks created via virsh, respectively our lab's static config). This will ensure deploys continue to work in both enviroments. Also, since our gateway resides at 10.0.9.254, trim the DHCP pool range for the public network to not include that address. To pass bridge information from CI, Fuel@OPNFV deploy scripts need some small adjustments as well. While at it, rebase our patches on top of latest Fuel@OPNFV changes. Change-Id: I92f01dd819ebf41b1da68d3b934fb10a23257e33 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch')
-rw-r--r--patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch16
1 files changed, 1 insertions, 15 deletions
diff --git a/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch b/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch
index bd647e0..ee55305 100644
--- a/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch
+++ b/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch
@@ -9,8 +9,7 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
mcp/config/defaults.yaml | 4 ++--
- mcp/scripts/lib.sh | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mcp/config/defaults.yaml b/mcp/config/defaults.yaml
index b841e88..17fbbfc 100644
@@ -25,16 +24,3 @@ index b841e88..17fbbfc 100644
+ vcpus: 6
ram: 4096
-diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
-index 1848c70..c315323 100644
---- a/mcp/scripts/lib.sh
-+++ b/mcp/scripts/lib.sh
-@@ -18,7 +18,7 @@ cleanup_vms() {
- # clean up existing nodes
- for node in $(virsh list --name | grep -P '\w{3}\d{2}'); do
- virsh destroy $node
-- virsh undefine $node
-+ virsh undefine --nvram $node
- done
- }
-