aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/config/scenario
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-24 20:28:01 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-04 00:05:45 +0100
commit4c32ab7cd0c86254019542fea65b6130248ea2e6 (patch)
treeb5d5d1e02e313015caeeb20f99e557da839f704a /mcp/config/scenario
parent81f3c7a84d84c4f936a81d588f819d342c01e1f1 (diff)
Add pre-{install,purge} support for base image
Extend <lib.sh> and its invocation from <ci.deploy.sh> with support for modifying foundation node VMs base image prior to using it with: - additional APT GPG keys; - additional APT repos; - packages to pre-install; - packages to pre-remove; - (non-configurable) cloud init datasource via NoCloud only, so VCP VMs won't wait for metadata service; While at it, re-use the resulting image as a base for another round of pre-patching (same operations as above are supported) to provide a base image for VCP VMs. Add AArch64-specific configuration based on new mechanisms: - pre-install linux-image-generic-hwe-16.04-edge (and headers) for foundation node and VCP (common) image (also requires new repo and its key); - pre-install cloud-init for VCP image (it should already be installed, but script needs non-empty config for VCP to create the VCP image and transfer it over to Salt Master); NOTE: cloud-init is required on VCP VMs for DHCP on 1st iface. JIRA: FUEL-309 Change-Id: I7dcaf0ffd9c57009133c6d339496ec831ab14375 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6ead32f737f39e3d82e1484a9d31f07ed2daeadb)
Diffstat (limited to 'mcp/config/scenario')
-rw-r--r--mcp/config/scenario/defaults-aarch64.yaml18
1 files changed, 18 insertions, 0 deletions
diff --git a/mcp/config/scenario/defaults-aarch64.yaml b/mcp/config/scenario/defaults-aarch64.yaml
index 24a4037b4..d9898191e 100644
--- a/mcp/config/scenario/defaults-aarch64.yaml
+++ b/mcp/config/scenario/defaults-aarch64.yaml
@@ -11,3 +11,21 @@ virtual:
default:
vcpus: 6
ram: 4096
+ common:
+ apt:
+ keys:
+ - https://linux.enea.com/mcp-repos/ocata/xenial/archive-mcpocata.key
+ repos:
+ # <repo name> <repo prio> deb [arch=<arch>] <repo url> <repo dist> <repo comp>
+ - armband_openstack 1100 deb [arch=arm64] http://linux.enea.com/mcp-repos/ocata/xenial ocata main
+ - armband_mk_openstack 1100 deb [arch=arm64] http://linux.enea.com/apt-mk/xenial nightly ocata
+ # NOTE(armband): Empty repo, keep commented out as reference
+ # - armband_mcp_extra 1100 deb [arch=arm64] http://linux.enea.com/apt-mk/xenial nightly extra
+ pkg:
+ install:
+ - linux-image-generic-hwe-16.04-edge
+ - linux-headers-generic-hwe-16.04-edge
+ control:
+ pkg:
+ install:
+ - cloud-init