From d3214693fe77551a195fd740e21c65118e8b84f2 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 14 Jul 2017 21:10:29 +0200 Subject: p/fuel: Rebase after upstream vCPU count rework Change-Id: Ic4066acc2716e5f3f497fba9799691e0258d3011 Signed-off-by: Alexandru Avadanii --- .../0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch | 15 +++------------ ...002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch | 12 ++++++------ ...3-lib.sh-AArch64-virt-install-Use-virtio-net-pci.patch | 6 +++--- ...0006-classes-virtual-AArch64-virtio-pci-net-sync.patch | 14 +++++++------- 4 files changed, 19 insertions(+), 28 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 06e8391e..24c23649 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,8 @@ Signed-off-by: Guillermo Herrero Signed-off-by: Alexandru Avadanii --- mcp/config/defaults.yaml | 4 ++-- - mcp/scripts/lib.sh | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) + mcp/scripts/lib.sh | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mcp/config/defaults.yaml b/mcp/config/defaults.yaml index b841e88..17fbbfc 100644 @@ -26,7 +26,7 @@ index b841e88..17fbbfc 100644 ram: 4096 diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh -index b3abd21..b2998e0 100644 +index fb3fc99..d56049c 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -18,7 +18,7 @@ cleanup_vms() { @@ -38,12 +38,3 @@ index b3abd21..b2998e0 100644 done } -@@ -57,7 +57,7 @@ create_vms() { - - # create vms with specified options - for node in "${vnodes[@]}"; do -- virt-install --name ${node} --ram ${vnodes_ram[$node]} --vcpus=2 --cpu host --accelerate \ -+ virt-install --name ${node} --ram ${vnodes_ram[$node]} --vcpus=6 --cpu host --accelerate \ - --network network:pxe,model=virtio \ - --network network:mgmt,model=virtio \ - --network network:internal,model=virtio \ 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 a4d71a82..c9b2f4d9 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 @@ -19,7 +19,7 @@ Signed-off-by: Alexandru Avadanii 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ci/deploy.sh b/ci/deploy.sh -index f98246d..c803a2a 100755 +index a1f5e38..92c7947 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -230,8 +230,9 @@ pushd ${DEPLOY_DIR} > /dev/null @@ -35,12 +35,12 @@ index f98246d..c803a2a 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 b2998e0..282ca38 100644 +index d56049c..4df1a5b 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh -@@ -55,6 +55,13 @@ create_vms() { - local -n vnodes=$1 +@@ -56,6 +56,13 @@ create_vms() { local -n vnodes_ram=$2 + local -n vnodes_vcpus=$3 + # AArch64: prepare arch specific arguments + local virt_extra_args="" @@ -51,8 +51,8 @@ index b2998e0..282ca38 100644 + # create vms with specified options for node in "${vnodes[@]}"; do - virt-install --name ${node} --ram ${vnodes_ram[$node]} --vcpus=6 --cpu host --accelerate \ -@@ -65,7 +72,8 @@ create_vms() { + virt-install --name ${node} --ram ${vnodes_ram[$node]} --vcpus ${vnodes_vcpus[$node]} --cpu host --accelerate \ +@@ -66,7 +73,8 @@ create_vms() { --disk path=$(pwd)/images/mcp_${node}.qcow2,format=qcow2,bus=virtio,cache=none,io=native \ --os-type linux --os-variant none \ --boot hd --vnc --console pty --autostart --noreboot \ diff --git a/patches/opnfv-fuel/0003-lib.sh-AArch64-virt-install-Use-virtio-net-pci.patch b/patches/opnfv-fuel/0003-lib.sh-AArch64-virt-install-Use-virtio-net-pci.patch index e311f0f0..ee0f736d 100644 --- a/patches/opnfv-fuel/0003-lib.sh-AArch64-virt-install-Use-virtio-net-pci.patch +++ b/patches/opnfv-fuel/0003-lib.sh-AArch64-virt-install-Use-virtio-net-pci.patch @@ -34,10 +34,10 @@ Signed-off-by: Alexandru Avadanii 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh -index 282ca38..12b1ef1 100644 +index 4df1a5b..3cce4ef 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh -@@ -57,23 +57,34 @@ create_vms() { +@@ -58,23 +58,34 @@ create_vms() { # AArch64: prepare arch specific arguments local virt_extra_args="" @@ -51,7 +51,7 @@ index 282ca38..12b1ef1 100644 # create vms with specified options for node in "${vnodes[@]}"; do - virt-install --name ${node} --ram ${vnodes_ram[$node]} --vcpus=6 --cpu host --accelerate \ + virt-install --name ${node} --ram ${vnodes_ram[$node]} --vcpus ${vnodes_vcpus[$node]} --cpu host --accelerate \ - --network network:pxe,model=virtio \ - --network network:mgmt,model=virtio \ - --network network:internal,model=virtio \ diff --git a/patches/opnfv-fuel/0006-classes-virtual-AArch64-virtio-pci-net-sync.patch b/patches/opnfv-fuel/0006-classes-virtual-AArch64-virtio-pci-net-sync.patch index dc839117..47dfd77b 100644 --- a/patches/opnfv-fuel/0006-classes-virtual-AArch64-virtio-pci-net-sync.patch +++ b/patches/opnfv-fuel/0006-classes-virtual-AArch64-virtio-pci-net-sync.patch @@ -32,10 +32,10 @@ Signed-off-by: Alexandru Avadanii 13 files changed, 36 insertions(+), 36 deletions(-) diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml -index 4fbc787..61239ab 100644 +index 328d6df..b0984a6 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml -@@ -28,7 +28,7 @@ parameters: +@@ -27,7 +27,7 @@ parameters: linux: network: interface: @@ -130,10 +130,10 @@ index 4ea51f3..6486eca 100644 type: eth mtu: ${_param:interface_mtu} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml -index 5932085..efde4b9 100644 +index 864c71d..27388fb 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml -@@ -27,7 +27,7 @@ parameters: +@@ -26,7 +26,7 @@ parameters: linux: network: interface: @@ -142,7 +142,7 @@ index 5932085..efde4b9 100644 enabled: true type: eth proto: static -@@ -50,14 +50,14 @@ parameters: +@@ -51,14 +51,14 @@ parameters: single_address: 172.16.10.105 tenant_address: 10.1.0.105 external_address: 10.16.0.105 @@ -232,10 +232,10 @@ index e102c10..6600a36 100644 type: eth mtu: ${_param:interface_mtu} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml -index 66ad53b..7daee82 100644 +index 97730b1..6a6f88b 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml -@@ -27,7 +27,7 @@ parameters: +@@ -26,7 +26,7 @@ parameters: linux: network: interface: -- cgit 1.2.3-korg