From 395b043ac49f1148d12206669cb19402812d547a Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 9 Sep 2017 21:33:34 +0200 Subject: scenario: Add AArch64 defaults Move scenario defaults.yml out of virtual/baremetal dirs, unifying them into a single, arch-specific defaults configuration file. Add AArch64 equivalent config, and arch-qualify default filename. For AArch64, bump VCPU number from 2 to 6. Change-Id: If9b39850af96e4c46e868b1d532bd301f9fd9f26 Signed-off-by: Alexandru Avadanii --- mcp/config/scenario/baremetal/defaults.yaml | 6 ------ mcp/config/scenario/defaults-aarch64.yaml | 6 ++++++ mcp/config/scenario/defaults-x86_64.yaml | 6 ++++++ mcp/config/scenario/virtual/defaults.yaml | 6 ------ 4 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 mcp/config/scenario/baremetal/defaults.yaml create mode 100644 mcp/config/scenario/defaults-aarch64.yaml create mode 100644 mcp/config/scenario/defaults-x86_64.yaml delete mode 100644 mcp/config/scenario/virtual/defaults.yaml (limited to 'mcp/config') diff --git a/mcp/config/scenario/baremetal/defaults.yaml b/mcp/config/scenario/baremetal/defaults.yaml deleted file mode 100644 index b841e88c9..000000000 --- a/mcp/config/scenario/baremetal/defaults.yaml +++ /dev/null @@ -1,6 +0,0 @@ -base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img -virtual: - default: - vcpus: 2 - ram: 4096 - diff --git a/mcp/config/scenario/defaults-aarch64.yaml b/mcp/config/scenario/defaults-aarch64.yaml new file mode 100644 index 000000000..17fbbfcbe --- /dev/null +++ b/mcp/config/scenario/defaults-aarch64.yaml @@ -0,0 +1,6 @@ +base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img +virtual: + default: + vcpus: 6 + ram: 4096 + diff --git a/mcp/config/scenario/defaults-x86_64.yaml b/mcp/config/scenario/defaults-x86_64.yaml new file mode 100644 index 000000000..b841e88c9 --- /dev/null +++ b/mcp/config/scenario/defaults-x86_64.yaml @@ -0,0 +1,6 @@ +base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img +virtual: + default: + vcpus: 2 + ram: 4096 + diff --git a/mcp/config/scenario/virtual/defaults.yaml b/mcp/config/scenario/virtual/defaults.yaml deleted file mode 100644 index b841e88c9..000000000 --- a/mcp/config/scenario/virtual/defaults.yaml +++ /dev/null @@ -1,6 +0,0 @@ -base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img -virtual: - default: - vcpus: 2 - ram: 4096 - -- cgit 1.2.3-korg