diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-04 18:48:04 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-04 18:49:06 +0200 |
| commit | 993fd182dc10552d38a0f1ecab9d341f29685483 (patch) | |
| tree | b7d813e1a2d177188125c76c5498c4ea35784ef0 /patches/opnfv-fuel/0006-mcp-config-AArch64-baremetal-Use-arm64-image.patch | |
| parent | 93beeac737a5b283fc3ae20d31226ea64bee232b (diff) | |
u/fuel: Bump & rebase for cinder support
Change-Id: Ie116967d0dd909f1901e2099485795316a706ad7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0006-mcp-config-AArch64-baremetal-Use-arm64-image.patch')
| -rw-r--r-- | patches/opnfv-fuel/0006-mcp-config-AArch64-baremetal-Use-arm64-image.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0006-mcp-config-AArch64-baremetal-Use-arm64-image.patch b/patches/opnfv-fuel/0006-mcp-config-AArch64-baremetal-Use-arm64-image.patch new file mode 100644 index 00000000..a47f2995 --- /dev/null +++ b/patches/opnfv-fuel/0006-mcp-config-AArch64-baremetal-Use-arm64-image.patch @@ -0,0 +1,60 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2017 Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Sun, 6 Aug 2017 19:34:06 +0200 +Subject: [PATCH] mcp/config: AArch64 baremetal: Use arm64 image + +While at it, bump default vCPU number from 2 to 6. + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + mcp/config/scenario/baremetal/defaults.yaml | 4 ++-- + mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml | 2 +- + mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/mcp/config/scenario/baremetal/defaults.yaml b/mcp/config/scenario/baremetal/defaults.yaml +index b841e88..17fbbfc 100644 +--- a/mcp/config/scenario/baremetal/defaults.yaml ++++ b/mcp/config/scenario/baremetal/defaults.yaml +@@ -1,6 +1,6 @@ +-base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img ++base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img + virtual: + default: +- vcpus: 2 ++ vcpus: 6 + ram: 4096 + +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 +index 0baebb6..c5a999b 100644 +--- 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 +@@ -54,7 +54,7 @@ parameters: + address: ${_param:single_address} + netmask: 255.255.255.0 + +- salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2 ++ salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img + salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/" + linux: + system: +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 +index 62f887d..23f205f 100644 +--- 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 +@@ -54,7 +54,7 @@ parameters: + address: ${_param:single_address} + netmask: 255.255.255.0 + +- salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2 ++ salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img + salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/" + linux: + system: |