summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-07-22 15:10:24 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-07-22 15:35:35 +0200
commit24352eb8102376ca93fe7a6b87e76936909e4677 (patch)
treeadae7fe8a1fca46044cad84d13afe651905172c9
parent2ed3a56ae4865514ba099773616df96865a0ca32 (diff)
[iec] centos: Preinstall git into cloud image
While at it, fix CentOS selinux preconfiguration on x86_64, which was previously limited (incorrectly) to AArch64. Change-Id: I2d6604d3eea2bfc11fdd5dd3aeb4e2c0c3ede4a2 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--mcp/config/scenario/defaults.yaml.j22
-rw-r--r--mcp/scripts/lib_jump_deploy.sh5
2 files changed, 5 insertions, 2 deletions
diff --git a/mcp/config/scenario/defaults.yaml.j2 b/mcp/config/scenario/defaults.yaml.j2
index 5dbf52950..697a8f70d 100644
--- a/mcp/config/scenario/defaults.yaml.j2
+++ b/mcp/config/scenario/defaults.yaml.j2
@@ -73,6 +73,7 @@ x86_64:
install:
- salt-minion
- epel-release
+ - git
control:
repo: ~
pkg:
@@ -141,6 +142,7 @@ aarch64:
install:
- salt-minion
- epel-release
+ - git
control:
repo: ~
pkg:
diff --git a/mcp/scripts/lib_jump_deploy.sh b/mcp/scripts/lib_jump_deploy.sh
index 40910f453..24fc4ee72 100644
--- a/mcp/scripts/lib_jump_deploy.sh
+++ b/mcp/scripts/lib_jump_deploy.sh
@@ -143,8 +143,6 @@ function __mount_image {
sudo umount -l "${OPNFV_MNT_DIR}"
# AArch64 CentOS cloud image has root partition at index 4 instead of 1
sudo mount "${OPNFV_MAP_DEV/p1/p4}" "${OPNFV_MNT_DIR}"
- sudo sed -i -e 's/^\(SELINUX\)=.*$/\1=permissive/g' \
- "${OPNFV_MNT_DIR}/etc/selinux/config"
else
# grub-update does not like /dev/nbd*, so use a loop device to work around it
sudo losetup "${OPNFV_LOOP_DEV}" "${OPNFV_MAP_DEV}"
@@ -170,6 +168,9 @@ function __mount_image {
sudo chroot "${OPNFV_MNT_DIR}" apt --assume-yes purge nplan netplan.io
echo "source /etc/network/interfaces.d/*" | \
sudo tee "${OPNFV_MNT_DIR}/etc/network/interfaces"
+ elif [[ "${MCP_OS:-}" =~ centos ]]; then
+ sudo sed -i -e 's/^\(SELINUX\)=.*$/\1=permissive/g' \
+ "${OPNFV_MNT_DIR}/etc/selinux/config"
fi
sudo cp -f --remove-destination \
/etc/resolv.conf "${OPNFV_MNT_DIR}/etc/resolv.conf"