diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-23 15:38:06 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-23 15:39:40 +0200 |
| commit | 93f8d97757dfe37d262a95148ac94f7a2c78a64e (patch) | |
| tree | a4393db9b1f34b11be4ece05f7164bdd9ecba8f8 /patches/opnfv-fuel/0008-mcp-config-AArch64-baremetal-Use-arm64-image.patch | |
| parent | 2cc327653a8a294346e6d47b0c94e9486414608a (diff) | |
p/fuel: Rebase after authorized_keys fix upstream
Change-Id: Id53c2513b52d05a44dffda0fda40f8df259e226b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0008-mcp-config-AArch64-baremetal-Use-arm64-image.patch')
| -rw-r--r-- | patches/opnfv-fuel/0008-mcp-config-AArch64-baremetal-Use-arm64-image.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/patches/opnfv-fuel/0008-mcp-config-AArch64-baremetal-Use-arm64-image.patch b/patches/opnfv-fuel/0008-mcp-config-AArch64-baremetal-Use-arm64-image.patch deleted file mode 100644 index cd959da3..00000000 --- a/patches/opnfv-fuel/0008-mcp-config-AArch64-baremetal-Use-arm64-image.patch +++ /dev/null @@ -1,38 +0,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-ovs-ha/infra/init.yml | 2 +- - 2 files changed, 3 insertions(+), 3 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-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml -index e3d47b0..93e2de0 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 -@@ -51,7 +51,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: - network: |