Revert "Add creation of security hardened images"
This is causing us to always build the hardened image, which
is a huge waste of time and disk space. The hardened image
needs to be added in a separate yaml file so it can be built
as needed.
This reverts commit fc07b696ac
.
Change-Id: I4493c8196dff9b615d75812118082e7d374a7c25
This commit is contained in:
parent
779f4adf96
commit
cdc55a91ea
@ -19,12 +19,4 @@ disk_images:
|
||||
- selinux-permissive
|
||||
packages:
|
||||
- yum-plugin-priorities
|
||||
-
|
||||
imagename: overcloud-security-hardened-full
|
||||
arch: amd64
|
||||
type: qcow2
|
||||
distro: centos7
|
||||
elements:
|
||||
- selinux-permissive
|
||||
packages:
|
||||
- yum-plugin-priorities
|
||||
|
||||
|
@ -11,8 +11,3 @@ disk_images:
|
||||
arch: amd64
|
||||
type: qcow2
|
||||
distro: rhel7
|
||||
-
|
||||
imagename: overcloud-security-hardened-full
|
||||
arch: amd64
|
||||
type: qcow2
|
||||
distro: rhel7
|
||||
|
@ -61,52 +61,3 @@ disk_images:
|
||||
- "--min-tmpfs=5"
|
||||
environment:
|
||||
DIB_PYTHON_VERSION: '2'
|
||||
|
||||
-
|
||||
imagename: overcloud-security-hardened-full
|
||||
arch: amd64
|
||||
type: qcow2
|
||||
elements:
|
||||
- dhcp-all-interfaces
|
||||
- overcloud-agent
|
||||
- overcloud-full
|
||||
- overcloud-controller
|
||||
- overcloud-compute
|
||||
- overcloud-ceph-storage
|
||||
- puppet-modules
|
||||
- hiera
|
||||
- os-net-config
|
||||
- stable-interface-names
|
||||
- bootloader
|
||||
- element-manifest
|
||||
- dynamic-login
|
||||
- iptables
|
||||
- enable-packages-install
|
||||
- pip-and-virtualenv-override
|
||||
- ntp
|
||||
- dracut-regenerate
|
||||
- remove-machine-id
|
||||
- modprobe-blacklist
|
||||
- overcloud-secure
|
||||
packages:
|
||||
- python-psutil
|
||||
- python-debtcollector
|
||||
- plotnetcfg
|
||||
- sos
|
||||
- device-mapper-multipath
|
||||
- python-heat-agent-puppet
|
||||
- python-heat-agent-hiera
|
||||
- python-heat-agent-apply-config
|
||||
- python-heat-agent-ansible
|
||||
- python-heat-agent-docker-cmd
|
||||
- python-heat-agent-json-file
|
||||
- screen
|
||||
options:
|
||||
- "--min-tmpfs 5"
|
||||
environment:
|
||||
DIB_PYTHON_VERSION: '2'
|
||||
DIB_MODPROBE_BLACKLIST: 'usb-storage cramfs freevxfs jffs2 hfs hfsplus squashfs udf vfat bluetooth'
|
||||
DIB_BOOTLOADER_DEFAULT_CMDLINE: 'nofb nomodeset vga=normal console=tty0 console=ttyS0,115200 audit=1 nousb'
|
||||
DIB_IMAGE_SIZE: '20'
|
||||
COMPRESS_IMAGE: '1'
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user