summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Wienand <iwienand@redhat.com>2017-08-01 09:47:50 +1000
committerIan Wienand <iwienand@redhat.com>2017-08-01 11:08:54 +1000
commit818b75af41b99b7573d3d9da132c7b866a2ac2a1 (patch)
tree667ac0860027f4be10a2d13a162154271052b2ce
parent308783d38215fe7060c0f56a17cdcc73ddd9e682 (diff)
Move selinux packages to redhat-common2.8.0
Change I008f8bbc9c8414ce948c601e3907e27764e15a52 has shown that we build redhat images without the "semange" tool available, which comes from the policycoreutils-python package (see also I3f9e2c322d042a5dddba33451c0fc21a4d32a88a). I403e7806ae10d5dd96d0727832f4da20e34b94c7 added some of the selinux libraries to yum-minimal for ansible support, but not to others. Given both these changes, it seems that selinux[-targeted], libselinux[-python] and policycoreutils[-python] can reasonably considered part of all base images. Move the selinux related packages into redhat-common. This also adds it explicitly to install_test_deps.sh. It was actually being dragged in by the docker install, but is a required component for building (should be in bindep, but not there with that yet). Change-Id: Idd4ae71ee6deee84604823b6b5dc4a845f316e01 Related-Bug: #1707788
Notes
Notes (review): Code-Review+1: Steve Baker <sbaker@redhat.com> Code-Review+1: Emilien Macchi <emilien@redhat.com> Code-Review+2: Ian Wienand <iwienand@redhat.com> Workflow+1: Ian Wienand <iwienand@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 01 Aug 2017 21:02:56 +0000 Reviewed-on: https://review.openstack.org/489434 Project: openstack/diskimage-builder Branch: refs/heads/master
-rw-r--r--diskimage_builder/elements/redhat-common/package-installs.yaml7
-rw-r--r--diskimage_builder/elements/yum-minimal/package-installs.yaml3
-rwxr-xr-xtests/install_test_deps.sh3
3 files changed, 9 insertions, 4 deletions
diff --git a/diskimage_builder/elements/redhat-common/package-installs.yaml b/diskimage_builder/elements/redhat-common/package-installs.yaml
index 81e19aa..1a8f25d 100644
--- a/diskimage_builder/elements/redhat-common/package-installs.yaml
+++ b/diskimage_builder/elements/redhat-common/package-installs.yaml
@@ -6,3 +6,10 @@ traceroute:
6which: 6which:
7gettext: 7gettext:
8 phase: pre-install.d 8 phase: pre-install.d
9
10# selinux-targeted policy and related tools
11selinux-policy:
12selinux-policy-targeted:
13libselinux-python:
14policycoreutils:
15policycoreutils-python:
diff --git a/diskimage_builder/elements/yum-minimal/package-installs.yaml b/diskimage_builder/elements/yum-minimal/package-installs.yaml
index 55d483d..87bfbde 100644
--- a/diskimage_builder/elements/yum-minimal/package-installs.yaml
+++ b/diskimage_builder/elements/yum-minimal/package-installs.yaml
@@ -6,7 +6,4 @@ kernel:
6initscripts: 6initscripts:
7man-pages: 7man-pages:
8lsb_release: 8lsb_release:
9selinux-policy:
10selinux-policy-targeted:
11libselinux-python:
12redhat-rpm-config: \ No newline at end of file 9redhat-rpm-config: \ No newline at end of file
diff --git a/tests/install_test_deps.sh b/tests/install_test_deps.sh
index cbb429d..c0876a3 100755
--- a/tests/install_test_deps.sh
+++ b/tests/install_test_deps.sh
@@ -23,7 +23,8 @@ sudo apt-get install -y --force-yes \
23 docker \ 23 docker \
24 kpartx \ 24 kpartx \
25 util-linux \ 25 util-linux \
26 qemu-img || \ 26 qemu-img \
27 policycoreutils-python || \
27 sudo zypper -n install \ 28 sudo zypper -n install \
28 bzip2 \ 29 bzip2 \
29 debootstrap \ 30 debootstrap \