fba2902dc6
Currently the only way to specify the CPU architecture of the overcloud images is by setting it in the appropriate yaml file. This is fine until you need to install a single package on multiple CPU architectures. Then you're either going to attempt to build the wrong image type or you have to edit the yaml files, which makes problems for upgrades. This change removes the default architecture from the yaml files and defaults to the appropriate DiB architecture based on running kernel. This enables builds on multiple CPU architectures from a single unmodified package Change-Id: I34f00a30c1e07869243fb95a437e05d6973a97da
47 lines
1.3 KiB
YAML
47 lines
1.3 KiB
YAML
disk_images:
|
|
-
|
|
imagename: overcloud-hardened-full
|
|
type: qcow2
|
|
elements:
|
|
- dhcp-all-interfaces
|
|
- overcloud-agent
|
|
- overcloud-full
|
|
- overcloud-controller
|
|
- overcloud-compute
|
|
- overcloud-ceph-storage
|
|
- puppet-modules
|
|
- os-net-config
|
|
- stable-interface-names
|
|
- bootloader
|
|
- element-manifest
|
|
- dynamic-login
|
|
- iptables
|
|
- enable-packages-install
|
|
- pip-and-virtualenv-override
|
|
- dracut-regenerate
|
|
- remove-machine-id
|
|
- modprobe-blacklist
|
|
- overcloud-secure
|
|
packages:
|
|
- ntp
|
|
- 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'
|