patches/opnfv-fuel/0006-mcp-config-AArch64-baremetal-Use-arm64-image.patch

   1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   2 : Copyright (c) 2017 Enea AB and others.
   3 :
   4 : All rights reserved. This program and the accompanying materials
   5 : are made available under the terms of the Apache License, Version 2.0
   6 : which accompanies this distribution, and is available at
   7 : http://www.apache.org/licenses/LICENSE-2.0
   8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   9 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  10 Date: Sun, 6 Aug 2017 19:34:06 +0200
  11 Subject: [PATCH] mcp/config: AArch64 baremetal: Use arm64 image
  12
  13 While at it, bump default vCPU number from 2 to 6.
  14
  15 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  16 ---
  17  mcp/config/scenario/baremetal/defaults.yaml                           | 4 ++--
  18  mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml | 2 +-
  19  mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml | 2 +-
  20  3 files changed, 4 insertions(+), 4 deletions(-)
  21
  22 diff --git a/mcp/config/scenario/baremetal/defaults.yaml b/mcp/config/scenario/baremetal/defaults.yaml
  23 index b841e88..17fbbfc 100644
  24 --- a/mcp/config/scenario/baremetal/defaults.yaml
  25 +++ b/mcp/config/scenario/baremetal/defaults.yaml
  26 @@ -1,6 +1,6 @@
  27 -base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
  28 +base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img
  29  virtual:
  30    default:
  31 -    vcpus: 2
  32 +    vcpus: 6
  33      ram: 4096
  34
  35 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
  36 index 0baebb6..c5a999b 100644
  37 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
  38 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
  39 @@ -54,7 +54,7 @@ parameters:
  40        address: ${_param:single_address}
  41        netmask: 255.255.255.0
  42
  43 -    salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2
  44 +    salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img
  45      salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
  46    linux:
  47      system:
  48 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
  49 index 62f887d..23f205f 100644
  50 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
  51 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
  52 @@ -54,7 +54,7 @@ parameters:
  53        address: ${_param:single_address}
  54        netmask: 255.255.255.0
  55
  56 -    salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2
  57 +    salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img
  58      salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
  59    linux:
  60      system: