File SLES12-SP3-JeOS-for-OpenStack-Cloud.diff of Package kiwi-templates-SLES12-JeOS

--- SLES12-SP3-JeOS.template
+++ SLES12-SP3-JeOS-for-OpenStack-Cloud.kiwi
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="6.1" name="SLES12-SP3-JeOS-TEMPLATE">
+<image schemaversion="6.1" name="SLES12-SP3-JeOS-for-OpenStack-Cloud">
     <description type="system">
         <author>Anja Stock</author>
         <contact>ast@suse.com</contact>
@@ -20,41 +20,18 @@
         <rpm-excludedocs>true</rpm-excludedocs>
         <type
             image="vmx"
-            filesystem="btrfs"
+            filesystem="xfs"
             boot="vmxboot/suse-SLES12"
             format="qcow2"
+            vga="normal"
+            boottimeout="1"
             bootloader="grub2"
             firmware="uefi"
-            kernelcmdline="systemd.show_status=0 plymouth.enable=0"
+            kernelcmdline="plymouth.enable=0 console=tty1 console=ttyS0 net.ifnames=0"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-label"
-            btrfs_root_is_snapshot="true"
-        >
-            <systemdisk name="SLES12-SP3-JeOS-TEMPLATE">
-                <volume name="home"/>
-                <volume name="tmp"/>
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/i386-pc"/>
-                <volume name="boot/grub2/x86_64-efi" mountpoint="boot/grub2/x86_64-efi"/>
-                <volume name="var/cache"/>
-                <volume name="var/crash"/>
-                <volume name="var/lib/machines"/>
-                <volume name="var/lib/mailman"/>
-                <volume name="var/lib/named"/>
-                <volume name="var/lib/mysql"/> <!-- Requires No CoW, applied by kiwi-hook -->
-                <volume name="var/lib/mariadb"/> <!-- Requires No CoW, applied by kiwi-hook -->
-                <volume name="var/lib/pgsql"/> <!-- Requires No CoW, applied by kiwi-hook -->
-                <volume name="var/lib/libvirt/images"/> <!-- Requires No CoW, applied by kiwi-hook -->
-                <volume name="usr/local"/>
-                <volume name="var/log"/>
-                <volume name="var/opt"/>
-                <volume name="var/spool"/>
-                <volume name="var/tmp"/>
-            </systemdisk>
-            <size unit="G">24</size>
-        </type>
+        />
     </preferences>
     <repository type="rpm-md" >
         <source path='obsrepositories:/'/>
@@ -63,8 +40,6 @@
         <package name="patterns-sles-Minimal"/>
         <package name="aaa_base-extras"/> <!-- wouldn't be SUSE without that ;-) -->
         <package name="acl"/>
-        <package name="btrfsprogs"/>
-        <package name="btrfsmaintenance"/>
         <package name="cron"/> <!-- needed by btrfsmaintenance -->
         <package name="curl"/> <!-- needed for openQA, maybe delete -->
         <package name="dracut"/>
@@ -85,7 +60,6 @@
         <package name="openslp"/>
         <package name="tar"/>
         <package name="parted"/>
-        <package name="snapper"/>
         <package name="SUSEConnect"/>
         <package name="SuSEfirewall2"/>
         <package name="systemd"/>
@@ -105,9 +79,11 @@
         <package name="sg3_utils"/>
         <package name="ncurses-utils"/>
         <package name="krb5"/>
-        <package name="dialog"/>                <!-- this is needed to support simple dialogs at boot time -->
-        <package name="grub2-snapper-plugin"/>  <!-- snapper - grub2 - integration, "small" -->
-        <package name="snapper-zypp-plugin"/>   <!-- this is key snapper/zypp integration, as requested in the PRD -->
+        <package name="xfsprogs" />
+
+        <!-- cloud specific packages -->
+        <package name="cloud-init" />
+        <package name="cloud-init-config-suse" />
     </packages>
     <packages type="bootstrap">
         <package name="udev"/>
@@ -182,5 +158,7 @@
         <package name="libXau6"/>
         <package name="libfreetype6"/>
         <package name="shared-mime-info"/>
+        <package name="btrfsprogs"/>
+        <package name="btrfsprogs-udev-rules"/>
     </packages>
 </image>