disk_images:
  -
    imagename: overcloud-full
    arch: amd64
    type: qcow2
    elements:
      - baremetal
      - dhcp-all-interfaces
      - overcloud-agent
      - overcloud-full
      - overcloud-controller
      - overcloud-compute
      - overcloud-ceph-storage
      - puppet-modules
      - hiera
      - os-net-config
      - stable-interface-names
      - grub2
      - element-manifest
      - dynamic-login
      - enable-packages-install
      - pip-and-virtualenv-override
    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
    options:
      - "--min-tmpfs 5"
  -
    imagename: ironic-python-agent
    arch: amd64
    # 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-agent
      - dynamic-login
      - element-manifest
      - network-gateway
      - enable-packages-install
      - pip-and-virtualenv-override
    packages:
      - python-hardware-detect
    options:
      - "--min-tmpfs=5"


disk_images:
  -
    imagename: overcloud-full
    arch: amd64
    type: qcow2
    elements:
      - baremetal
      - dhcp-all-interfaces
      - overcloud-agent
      - overcloud-full
      - overcloud-controller
      - overcloud-compute
      - overcloud-ceph-storage
      - puppet-modules
      - hiera
      - os-net-config
      - stable-interface-names
      - grub2
      - element-manifest
      - dynamic-login
      - iptables
      - enable-packages-install
      - pip-and-virtualenv-override
    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
    options:
      - "--min-tmpfs 5"
  -
    imagename: ironic-python-agent
    arch: amd64
    # 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-agent
      - dynamic-login
      - element-manifest
      - network-gateway
      - enable-packages-install
      - pip-and-virtualenv-override
    packages:
      - python-hardware-detect
    options:
      - "--min-tmpfs=5"


Add the iptables element to the image building process
Add the iptables element to the image building process

Adding the iptables element will effectively empty
/etc/sysconfig/iptables and will solve the linked bug where a full
explanation of the different approaches has been provided.

This approach has been chosen because other approaches proved to
be either to complex *or* required that we enable the purging of
rules by default which might be disruptive for existing installations.

Closes-Bug: #1657108
Change-Id: Id0498a1158b5ace0df961248946f3ab5f11c26da
Depends-On: Iddc21316a1a3d42a1a43cbb4b9c178adba8f8db3
