summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rwxr-xr-xci/deploy.sh23
-rw-r--r--mcp/config/scenario/defaults-aarch64.yaml18
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml2
-rw-r--r--mcp/scripts/lib.sh137
-rwxr-xr-xmcp/scripts/salt.sh12
6 files changed, 185 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 4e90f3248..38b444007 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
**/mcp/scripts/mcp.rsa*
**/mcp/scripts/user-data.sh
**/mcp/scripts/net_mcpcontrol.xml
+**/mcp/scripts/*.img
diff --git a/ci/deploy.sh b/ci/deploy.sh
index b13e18e7e..427850fda 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -15,6 +15,7 @@
do_exit () {
local RC=$?
clean
+ cleanup_mounts
if [ ${RC} -eq 0 ]; then
notify "\n[OK] MCP: Openstack installation finished succesfully!\n\n" 2
else
@@ -158,6 +159,7 @@ NO_DEPLOY_ENVIRONMENT=${NO_DEPLOY_ENVIRONMENT:-0}
ERASE_ENV=${ERASE_ENV:-0}
source "${DEPLOY_DIR}/globals.sh"
+source "${DEPLOY_DIR}/lib.sh"
#
# END of variables to customize
@@ -340,7 +342,6 @@ fi
# Get required infra deployment data
set +x
-source lib.sh
eval "$(parse_yaml "${SCENARIO_DIR}/defaults-$(uname -i).yaml")"
eval "$(parse_yaml "${SCENARIO_DIR}/${DEPLOY_TYPE}/${DEPLOY_SCENARIO}.yaml")"
eval "$(parse_yaml "${LOCAL_PDF_RECLASS}")"
@@ -358,6 +359,23 @@ for node in "${virtual_nodes[@]}"; do
done
virtual_nodes_data=${virtual_nodes_data%|}
+# Serialize repos, packages to (pre-)install/remove for:
+# - foundation node VM base image (virtual: all VMs, baremetal: cfg01|mas01)
+# - virtualized control plane VM base image (only when VCP is used)
+base_image_flavors=common
+if [[ "${cluster_states[*]}" =~ virtual_control ]]; then
+ base_image_flavors+=" control"
+fi
+for sc in ${base_image_flavors}; do
+ for va in apt_keys apt_repos pkg_install pkg_remove; do
+ key=virtual_${sc}_${va}
+ eval "${key}=\${${key}[@]// /|}"
+ eval "${key}=\${${key}// /,}"
+ virtual_repos_pkgs+="${!key}^"
+ done
+done
+virtual_repos_pkgs=${virtual_repos_pkgs%^}
+
# Expand reclass and virsh network templates
for tp in "${RECLASS_CLUSTER_DIR}/all-mcp-ocata-common/opnfv/"*.template \
net_*.template; do
@@ -413,7 +431,8 @@ elif [ ${USE_EXISTING_INFRA} -gt 0 ]; then
check_connection
else
generate_ssh_key
- prepare_vms "${base_image}" "${STORAGE_DIR}" "${virtual_nodes[@]}"
+ prepare_vms "${base_image}" "${STORAGE_DIR}" "${virtual_repos_pkgs}" \
+ "${virtual_nodes[@]}"
create_networks "${OPNFV_BRIDGES[@]}"
create_vms "${STORAGE_DIR}" "${virtual_nodes_data}" "${OPNFV_BRIDGES[@]}"
update_mcpcontrol_network
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
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml
index b5b78ec08..0350afa3d 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml
@@ -8,7 +8,7 @@
---
parameters:
_param:
- salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img
+ salt_control_xenial_image: salt://salt/files/control/images/base_image_opnfv_fuel_vcp.img
# VMs spawned on Foundation Node / Jump Host net ifaces (max 4)
opnfv_fn_vm_primary_interface: enp1s0
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index c6d5d26ce..654f45e1f 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -1,4 +1,5 @@
#!/bin/bash -e
+# shellcheck disable=SC2155,SC1001
##############################################################################
# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
# All rights reserved. This program and the accompanying materials
@@ -11,7 +12,6 @@
#
function generate_ssh_key {
- # shellcheck disable=SC2155
local mcp_ssh_key=$(basename "${SSH_KEY}")
local user=${USER}
if [ -n "${SUDO_USER}" ] && [ "${SUDO_USER}" != 'root' ]; then
@@ -35,6 +35,110 @@ function get_base_image {
wget -P "${image_dir}" -N "${base_image}"
}
+function mount_image {
+ local image=$1
+ local image_dir=$2
+ OPNFV_MNT_DIR="${image_dir}/ubuntu"
+
+ sudo modprobe nbd loop
+ # Find free nbd, loop devices
+ for dev in '/sys/class/block/nbd'*; do
+ if [ "$(cat "${dev}/size")" = '0' ]; then
+ OPNFV_NBD_DEV=/dev/$(basename "${dev}")
+ break
+ fi
+ done
+ OPNFV_LOOP_DEV=$(losetup -f)
+ export OPNFV_MNT_DIR OPNFV_LOOP_DEV
+ [ -n "${OPNFV_NBD_DEV}" ] && [ -n "${OPNFV_LOOP_DEV}" ] || exit 1
+ sudo qemu-nbd --connect="${OPNFV_NBD_DEV}" --aio=native --cache=none \
+ "${image_dir}/${image}"
+ sleep 5 # /dev/nbdNp1 takes some time to come up
+ # grub-update does not like /dev/nbd*, so use a loop device to work around it
+ # Hardcode partition index to 1, unlikely to change for Ubuntu UCA image
+ sudo losetup "${OPNFV_LOOP_DEV}" "${OPNFV_NBD_DEV}p1"
+ mkdir -p "${OPNFV_MNT_DIR}"
+ sudo mount "${OPNFV_LOOP_DEV}" "${OPNFV_MNT_DIR}"
+ sudo mount -t proc proc "${OPNFV_MNT_DIR}/proc"
+ sudo mount -t sysfs sys "${OPNFV_MNT_DIR}/sys"
+ sudo mount -o bind /dev "${OPNFV_MNT_DIR}/dev"
+ sudo mkdir -p "${OPNFV_MNT_DIR}/run/resolvconf"
+ sudo cp /etc/resolv.conf "${OPNFV_MNT_DIR}/run/resolvconf"
+ echo "GRUB_DISABLE_OS_PROBER=true" | \
+ sudo tee -a "${OPNFV_MNT_DIR}/etc/default/grub"
+}
+
+function apt_repos_pkgs_image {
+ local apt_key_urls=(${1//,/ })
+ local all_repos=(${2//,/ })
+ local pkgs_i=(${3//,/ })
+ local pkgs_r=(${4//,/ })
+ [ -n "${OPNFV_MNT_DIR}" ] || exit 1
+
+ # APT keys
+ if [ "${#apt_key_urls[@]}" -gt 0 ]; then
+ for apt_key in "${apt_key_urls[@]}"; do
+ sudo chroot "${OPNFV_MNT_DIR}" /bin/bash -c \
+ "wget -qO - '${apt_key}' | apt-key add -"
+ done
+ fi
+ # Additional repositories
+ for repo_line in "${all_repos[@]}"; do
+ # <repo_name>|<repo prio>|deb|[arch=<arch>]|<repo url>|<dist>|<repo comp>
+ local repo=(${repo_line//|/ })
+ [ "${#repo[@]}" -gt 5 ] || continue
+ # NOTE: Names and formatting are compatible with Salt linux.system.repo
+ cat <<-EOF | sudo tee "${OPNFV_MNT_DIR}/etc/apt/preferences.d/${repo[0]}"
+
+ Package: *
+ Pin: release a=${repo[-2]}
+ Pin-Priority: ${repo[1]}
+
+ EOF
+ echo "${repo[@]:2}" | sudo tee \
+ "${OPNFV_MNT_DIR}/etc/apt/sources.list.d/${repo[0]}.list"
+ done
+ # Install packages
+ if [ "${#pkgs_i[@]}" -gt 0 ]; then
+ sudo DEBIAN_FRONTEND="noninteractive" \
+ chroot "${OPNFV_MNT_DIR}" apt-get update
+ sudo DEBIAN_FRONTEND="noninteractive" FLASH_KERNEL_SKIP="true" \
+ chroot "${OPNFV_MNT_DIR}" apt-get install -y "${pkgs_i[@]}"
+ fi
+ # Remove packages
+ if [ "${#pkgs_r[@]}" -gt 0 ]; then
+ sudo DEBIAN_FRONTEND="noninteractive" FLASH_KERNEL_SKIP="true" \
+ chroot "${OPNFV_MNT_DIR}" apt-get purge -y "${pkgs_r[@]}"
+ fi
+ # Disable cloud-init metadata service datasource
+ sudo mkdir -p "${OPNFV_MNT_DIR}/etc/cloud/cloud.cfg.d"
+ echo "datasource_list: [ NoCloud, None ]" | sudo tee \
+ "${OPNFV_MNT_DIR}/etc/cloud/cloud.cfg.d/95_real_datasources.cfg"
+}
+
+function cleanup_mounts {
+ # Remove any mounts, loop and/or nbd devs created while patching base image
+ if [ -n "${OPNFV_MNT_DIR}" ] && [ -d "${OPNFV_MNT_DIR}" ]; then
+ if [ -f "${OPNFV_MNT_DIR}/boot/grub/grub.cfg" ]; then
+ # Grub thinks it's running from a live CD
+ sudo sed -i -e 's/^\s*set root=.*$//g' -e 's/^\s*loopback.*$//g' \
+ "${OPNFV_MNT_DIR}/boot/grub/grub.cfg"
+ fi
+ sudo rm -f "${OPNFV_MNT_DIR}/run/resolvconf/resolv.conf"
+ sync
+ if mountpoint -q "${OPNFV_MNT_DIR}"; then
+ sudo umount -l "${OPNFV_MNT_DIR}" || true
+ fi
+ fi
+ if [ -n "${OPNFV_LOOP_DEV}" ] && \
+ losetup "${OPNFV_LOOP_DEV}" 1>&2 > /dev/null; then
+ sudo losetup -d "${OPNFV_LOOP_DEV}"
+ fi
+ if [ -n "${OPNFV_NBD_DEV}" ]; then
+ sudo qemu-nbd -d "${OPNFV_NBD_DEV}" || true
+ fi
+}
+
function cleanup_uefi {
# Clean up Ubuntu boot entry if cfg01, kvm nodes online from previous deploy
# shellcheck disable=SC2086
@@ -60,22 +164,45 @@ function cleanup_vms {
function prepare_vms {
local base_image=$1; shift
local image_dir=$1; shift
+ local repos_pkgs_str=$1; shift # ^-sep list of repos, pkgs to install/rm
local vnodes=("$@")
+ local image=base_image_opnfv_fuel.img
cleanup_uefi
cleanup_vms
get_base_image "${base_image}" "${image_dir}"
+
+ rm -f "${image_dir}/${image%.*}"*
+ if [[ ! "${repos_pkgs_str}" =~ ^\^+$ ]]; then
+ IFS='^' read -r -a repos_pkgs <<< "${repos_pkgs_str}"
+ cp "${image_dir}/${base_image/*\/}" "${image_dir}/${image}"
+ mount_image "${image}" "${image_dir}"
+ apt_repos_pkgs_image "${repos_pkgs[@]:0:4}"
+ cleanup_mounts
+ else
+ ln -sf "${image_dir}/${base_image/*\/}" "${image_dir}/${image}"
+ fi
+
+ # CWD should be <mcp/scripts>
# shellcheck disable=SC2016
envsubst '${SALT_MASTER},${CLUSTER_DOMAIN}' < \
user-data.template > user-data.sh
+ # Create config ISO and resize OS disk image for each foundation node VM
for node in "${vnodes[@]}"; do
- # create/prepare images
./create-config-drive.sh -k "$(basename "${SSH_KEY}").pub" -u user-data.sh \
-h "${node}" "${image_dir}/mcp_${node}.iso"
- cp "${image_dir}/${base_image/*\/}" "${image_dir}/mcp_${node}.qcow2"
+ cp "${image_dir}/${image}" "${image_dir}/mcp_${node}.qcow2"
qemu-img resize "${image_dir}/mcp_${node}.qcow2" 100G
done
+
+ # VCP VMs base image specific changes
+ if [[ ! "${repos_pkgs_str}" =~ \^{3}$ ]] && [ -n "${repos_pkgs[*]:4}" ]; then
+ mount_image "${image}" "${image_dir}"
+ apt_repos_pkgs_image "${repos_pkgs[@]:4:4}"
+ cleanup_mounts
+ ln -sf "${image_dir}/${image}" "${image_dir}/${image%.*}_vcp.img"
+ fi
}
function create_networks {
@@ -100,6 +227,8 @@ function create_networks {
function create_vms {
local image_dir=$1; shift
+ # vnode data should be serialized with the following format:
+ # '<name0>,<ram0>,<vcpu0>|<name1>,<ram1>,<vcpu1>[...]'
IFS='|' read -r -a vnodes <<< "$1"; shift
local vnode_networks=("$@")
@@ -139,9 +268,7 @@ function create_vms {
function update_mcpcontrol_network {
# set static ip address for salt master node, MaaS node
- # shellcheck disable=SC2155
local cmac=$(virsh domiflist cfg01 2>&1| awk '/mcpcontrol/ {print $5; exit}')
- # shellcheck disable=SC2155
local amac=$(virsh domiflist mas01 2>&1| awk '/mcpcontrol/ {print $5; exit}')
virsh net-update "mcpcontrol" add ip-dhcp-host \
"<host mac='${cmac}' name='cfg01' ip='${SALT_MASTER}'/>" --live
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index ab096f3ee..b719aa8ae 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -18,6 +18,8 @@ OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/opnfv"
OPNFV_GIT_DIR="/root/opnfv"
OPNFV_FUEL_DIR="/root/fuel"
OPNFV_RDIR="reclass/classes/cluster/all-mcp-ocata-common"
+OPNFV_VCP_IMG="mcp/scripts/base_image_opnfv_fuel_vcp.img"
+OPNFV_VCP_DIR="/srv/salt/env/prd/salt/files/control/images"
LOCAL_GIT_DIR="${F_GIT_ROOT%${F_GIT_SUBD}}"
LOCAL_PDF_RECLASS=$1
NODE_MASK='*'
@@ -34,6 +36,11 @@ if [ -n "${LOCAL_PDF_RECLASS}" ] && [ -f "${LOCAL_PDF_RECLASS}" ]; then
rsync -e "ssh ${SSH_OPTS}" "${LOCAL_PDF_RECLASS}" \
"${remote_tmp}${F_GIT_SUBD}/mcp/${OPNFV_RDIR}/opnfv/"
fi
+local_vcp_img=$(dirname "${LOCAL_PDF_RECLASS}")/$(basename "${OPNFV_VCP_IMG}")
+if [ -e "${local_vcp_img}" ]; then
+ rsync -L -e "ssh ${SSH_OPTS}" "${local_vcp_img}" \
+ "${remote_tmp}${F_GIT_SUBD}/${OPNFV_VCP_IMG}"
+fi
# ssh to cfg01
# shellcheck disable=SC2086,2087
@@ -95,4 +102,9 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
salt -C "${NODE_MASK} and not cfg01*" pkg.upgrade refresh=False
salt -C "${NODE_MASK} or cfg01*" state.sls ntp
+
+ if [ -f "${OPNFV_FUEL_DIR}/${OPNFV_VCP_IMG}" ]; then
+ mkdir -p "${OPNFV_VCP_DIR}"
+ mv "${OPNFV_FUEL_DIR}/${OPNFV_VCP_IMG}" "${OPNFV_VCP_DIR}/"
+ fi
SALT_INSTALL_END