diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-07-18 19:19:46 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-07-26 20:07:57 +0200 |
| commit | f07754a88c17467036b9b0c92a6560eceb7bcd8e (patch) | |
| tree | c90f7122d393e3e4fa6c9264b9095c3e09163285 /patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch | |
| parent | 94466c5acd31c3acd7b473bc4972693782582fef (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/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch')
| -rw-r--r-- | patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch b/patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch index 4ab98b5f..29b22a63 100644 --- a/patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch +++ b/patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch @@ -35,10 +35,10 @@ index a1f5e38..92c7947 100755 # Check scenario file existence if [[ ! -f ../config/${DEPLOY_SCENARIO}.yaml ]]; then diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh -index c315323..862fdcc 100644 +index 3ec596a..b75e47e 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh -@@ -56,6 +56,13 @@ create_vms() { +@@ -58,6 +58,13 @@ create_vms() { local -n vnodes_ram=$2 local -n vnodes_vcpus=$3 @@ -52,7 +52,7 @@ index c315323..862fdcc 100644 # create vms with specified options for node in "${vnodes[@]}"; do virt-install --name ${node} --ram ${vnodes_ram[$node]} --vcpus ${vnodes_vcpus[$node]} --cpu host --accelerate \ -@@ -67,7 +74,8 @@ create_vms() { +@@ -69,7 +76,8 @@ create_vms() { --os-type linux --os-variant none \ --boot hd --vnc --console pty --autostart --noreboot \ --disk path=$(pwd)/images/mcp_${node}.iso,device=cdrom \ |