diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-07-24 13:47:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-07-24 13:47:10 +0000 |
| commit | e482be713cd97e862637bec6f89d5c41fe40e549 (patch) | |
| tree | cb00621db5707b530da8cfdeba6dae5357a4f6d2 /mcp | |
| parent | 7e909a3de0898448ee43c56efb264c74aa0feac6 (diff) | |
| parent | 24352eb8102376ca93fe7a6b87e76936909e4677 (diff) | |
Merge "[iec] centos: Preinstall git into cloud image"
Diffstat (limited to 'mcp')
| -rw-r--r-- | mcp/config/scenario/defaults.yaml.j2 | 2 | ||||
| -rw-r--r-- | mcp/scripts/lib_jump_deploy.sh | 5 |
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" |