Browse Source

Merge "Delete python2 based images"

changes/63/793963/1
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
d5062b4139
  1. 45
      image-yaml/overcloud-hardened-images-uefi.yaml
  2. 44
      image-yaml/overcloud-hardened-images.yaml
  3. 58
      image-yaml/overcloud-images.yaml
  4. 37
      image-yaml/overcloud-realtime-compute.yaml

45
image-yaml/overcloud-hardened-images-uefi.yaml

@ -1,45 +0,0 @@
disk_images:
-
imagename: overcloud-hardened-uefi-full
type: qcow2
elements:
- openvswitch
- overcloud-agent
- overcloud-base
- overcloud-controller
- overcloud-compute
- overcloud-ceph-storage
- puppet-modules
- stable-interface-names
- bootloader
- element-manifest
- dynamic-login
- iptables
- enable-packages-install
- override-pip-and-virtualenv
- dracut-regenerate
- remove-machine-id
- remove-resolvconf
- modprobe
- overcloud-partition-uefi
- overcloud-secure
- openssh
- disable-nouveau
packages:
- python-psutil
- python-debtcollector
- sos
- device-mapper-multipath
- openstack-heat-agents
- screen
- os-net-config
- jq
options:
- "--min-tmpfs=7"
environment:
DIB_PYTHON_VERSION: '2'
DIB_MODPROBE_BLACKLIST: 'usb-storage cramfs freevxfs jffs2 hfs hfsplus squashfs udf bluetooth'
DIB_BOOTLOADER_DEFAULT_CMDLINE: 'nofb nomodeset vga=normal console=tty0 console=ttyS0,115200 audit=1 nousb'
DIB_IMAGE_SIZE: '40'
COMPRESS_IMAGE: '1'
DIB_BLOCK_DEVICE: 'efi'

44
image-yaml/overcloud-hardened-images.yaml

@ -1,44 +0,0 @@
disk_images:
-
imagename: overcloud-hardened-full
type: qcow2
elements:
- openvswitch
- overcloud-agent
- overcloud-base
- overcloud-controller
- overcloud-compute
- overcloud-ceph-storage
- puppet-modules
- stable-interface-names
- bootloader
- element-manifest
- dynamic-login
- iptables
- enable-packages-install
- override-pip-and-virtualenv
- dracut-regenerate
- remove-machine-id
- remove-resolvconf
- modprobe
- overcloud-partition
- overcloud-secure
- openssh
- disable-nouveau
packages:
- python-psutil
- python-debtcollector
- sos
- device-mapper-multipath
- openstack-heat-agents
- screen
- os-net-config
- jq
options:
- "--min-tmpfs=7"
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: '40'
COMPRESS_IMAGE: '1'

58
image-yaml/overcloud-images.yaml

@ -1,58 +0,0 @@
disk_images:
-
imagename: overcloud-full
type: qcow2
elements:
- baremetal
- openvswitch
- overcloud-agent
- overcloud-base
- overcloud-controller
- overcloud-compute
- overcloud-ceph-storage
- puppet-modules
- stable-interface-names
- grub2
- element-manifest
- dynamic-login
- iptables
- enable-packages-install
- override-pip-and-virtualenv
- dracut-regenerate
- remove-machine-id
- remove-resolvconf
- openssh
- disable-nouveau
packages:
- python-psutil
- python-debtcollector
- sos
- device-mapper-multipath
- openstack-heat-agents
- os-net-config
- jq
- dbus-python
options:
- "--min-tmpfs=7"
environment:
DIB_PYTHON_VERSION: '2'
-
imagename: ironic-python-agent
# This is bogus, but there's no initrd type in diskimage-builder
type: qcow2
# So we just override the extension instead
imageext: initramfs
elements:
- ironic-python-agent-ramdisk
- ironic-agent-multipath
- dynamic-login
- element-manifest
- network-gateway
- enable-packages-install
- override-pip-and-virtualenv
- extra-hardware
options:
- "--min-tmpfs=7"
environment:
DIB_EPEL_DISABLED: 1
DIB_PYTHON_VERSION: '2'

37
image-yaml/overcloud-realtime-compute.yaml

@ -1,37 +0,0 @@
disk_images:
-
imagename: overcloud-realtime-compute
type: qcow2
elements:
- baremetal
- openvswitch
- overcloud-agent
- overcloud-compute
- puppet-modules
- stable-interface-names
- grub2
- element-manifest
- dynamic-login
- iptables
- enable-packages-install
- override-pip-and-virtualenv
- dracut-regenerate
- remove-machine-id
- remove-resolvconf
- realtime-kernel
- openssh
- disable-nouveau
packages:
- python-psutil
- python-debtcollector
- sos
- device-mapper-multipath
- openstack-heat-agents
- os-net-config
- jq
options:
- "--min-tmpfs=7"
environment:
DIB_PYTHON_VERSION: '2'
DIB_BAREMETAL_KERNEL_PATTERN: 'vmlinuz*.rt*'
DIB_BAREMETAL_INITRD_PATTERN: 'initramfs-*.rt*'
Loading…
Cancel
Save