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

   1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   2 Date: Sun, 6 Aug 2017 19:34:06 +0200
   3 Subject: [PATCH] mcp/config: AArch64 baremetal: Use arm64 image
   4
   5 While at it, bump default vCPU number from 2 to 6.
   6
   7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   8 ---
   9  mcp/config/scenario/baremetal/defaults.yaml                           | 4 ++--
  10  mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml | 2 +-
  11  mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml | 2 +-
  12  3 files changed, 4 insertions(+), 4 deletions(-)
  13
  14 diff --git a/mcp/config/scenario/baremetal/defaults.yaml b/mcp/config/scenario/baremetal/defaults.yaml
  15 index b841e88..17fbbfc 100644
  16 --- a/mcp/config/scenario/baremetal/defaults.yaml
  17 +++ b/mcp/config/scenario/baremetal/defaults.yaml
  18 @@ -1,6 +1,6 @@
  19 -base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
  20 +base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img
  21  virtual:
  22    default:
  23 -    vcpus: 2
  24 +    vcpus: 6
  25      ram: 4096
  26
  27 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
  28 index 5862ddb..ab14c58 100644
  29 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
  30 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
  31 @@ -51,7 +51,7 @@ parameters:
  32        address: ${_param:single_address}
  33        netmask: 255.255.255.0
  34
  35 -    salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2
  36 +    salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img
  37      salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
  38    linux:
  39      network:
  40 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
  41 index e3d47b0..93e2de0 100644
  42 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
  43 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
  44 @@ -51,7 +51,7 @@ parameters:
  45        address: ${_param:single_address}
  46        netmask: 255.255.255.0
  47
  48 -    salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2
  49 +    salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img
  50      salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
  51    linux:
  52      network: