From 49ca8f5454ffd159c36e74e2203222b5bb12eeab Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Tue, 28 Aug 2018 14:37:05 -0600
Subject: [PATCH] Add image building config file for Fedora and py3

Here's an image building configuration file that can be used to build
overcloud full images on Fedora 28.

Change-Id: I43e3dbcfeab4f5237e79f42bad39e52bed9aef0e
Related-Blueprint: python3-support
---
 image-yaml/overcloud-images-fedora.yaml  | 22 +++++++++
 image-yaml/overcloud-images-python3.yaml | 61 ++++++++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 image-yaml/overcloud-images-fedora.yaml
 create mode 100644 image-yaml/overcloud-images-python3.yaml

diff --git a/image-yaml/overcloud-images-fedora.yaml b/image-yaml/overcloud-images-fedora.yaml
new file mode 100644
index 000000000..6c75688ea
--- /dev/null
+++ b/image-yaml/overcloud-images-fedora.yaml
@@ -0,0 +1,22 @@
+disk_images:
+  -
+    imagename: overcloud-full
+    type: qcow2
+    distro: fedora
+    elements:
+      - selinux-permissive
+    environment:
+      FS_TYPE: xfs
+    packages:
+      - yum-plugin-priorities
+    options:
+      - "--mkfs-options '-s size=4096'"
+  -
+    imagename: ironic-python-agent
+    type: qcow2
+    distro: fedora
+    elements:
+      - selinux-permissive
+    packages:
+      - yum-plugin-priorities
+
diff --git a/image-yaml/overcloud-images-python3.yaml b/image-yaml/overcloud-images-python3.yaml
new file mode 100644
index 000000000..2ae4d0099
--- /dev/null
+++ b/image-yaml/overcloud-images-python3.yaml
@@ -0,0 +1,61 @@
+disk_images:
+  -
+    imagename: overcloud-full
+    type: qcow2
+    elements:
+      - baremetal
+      - dhcp-all-interfaces
+      - 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
+      - plotnetcfg
+      - sos
+      - ntp
+      - device-mapper-multipath
+      - openstack-heat-agents
+      - os-net-config
+      - jq
+      - dbus-python
+    options:
+      - "--min-tmpfs=7"
+    environment:
+      DIB_PYTHON_VERSION: '3'
+  -
+    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-agent
+      - ironic-agent-multipath
+      - dynamic-login
+      - element-manifest
+      - network-gateway
+      - enable-packages-install
+      - override-pip-and-virtualenv
+    packages:
+      - python-hardware-detect
+    options:
+      - "--min-tmpfs=7"
+    environment:
+      DIB_PYTHON_VERSION: '3'