--- openstack.yaml	2016-03-09 08:29:07.000000000 +0000
+++ xs_release.yaml	2016-03-09 08:29:07.000000000 +0000
@@ -1680,21 +1680,20 @@
         bind: !!pairs
           - "settings:common.libvirt_type.value": "qemu"
         weight: 5
-        label: "dialog.create_cluster_wizard.compute.qemu"
-        description: "dialog.create_cluster_wizard.compute.qemu_description"
-        compatible:
+        label: "XenServer"
+        description: "Select this option if you run OpenStack on XenServer."
+        incompatible:
           - name: hypervisor:vmware
+            message: "VMware not compatible with XenServer"
       - name: hypervisor:vmware
         weight: 15
         bind:
           - "settings:common.use_vcenter.value"
         label: "dialog.create_cluster_wizard.compute.vcenter"
         description: "dialog.create_cluster_wizard.compute.vcenter_description"
-        compatible:
-          - name: hypervisor:qemu
-        requires:
+        incompatible:
           - name: hypervisor:qemu
-            message: "dialog.create_cluster_wizard.compute.vcenter_warning"
+            message: "VMware not compatible with XenServer"
       - name: network:neutron:core:ml2
         default: true
         weight: 1000
@@ -1728,8 +1727,9 @@
         description: "dialog.create_cluster_wizard.network.neutron_tun_description"
         compatible:
           - name: network:neutron:core:ml2
-          - name: hypervisor:qemu
         incompatible:
+          - name: hypervisor:qemu
+            message: "VXLAN tunnels not compatible with XenServer"
           - name: network:neutron:ml2:vlan
             message: "dialog.create_cluster_wizard.network.vlan_tun_alert"
           - name: hypervisor:vmware
@@ -1762,7 +1762,6 @@
           - "settings:storage.volumes_ceph.value": true
           - "settings:storage.volumes_lvm.value": false
         compatible:
-          - name: hypervisor:qemu
           - name: hypervisor:vmware
           - name: network:neutron:core:ml2
           - name: network:neutron:ml2:vlan
@@ -1771,8 +1770,8 @@
           - name: storage:ephemeral:ceph
           - name: storage:image:ceph
         incompatible:
-          - name: storage:block:lvm
-            message: "Ceph not compatible with LVM"
+          - name: hypervisor:qemu
+            message: "Ceph not compatible with XenServer"
       - name: storage:object:ceph
         label: "dialog.create_cluster_wizard.storage.ceph"
         description: "dialog.create_cluster_wizard.storage.ceph_object"
@@ -1780,7 +1779,6 @@
         bind:
           - "settings:storage.objects_ceph.value"
         compatible:
-          - name: hypervisor:qemu
           - name: hypervisor:vmware
           - name: network:neutron:core:ml2
           - name: network:neutron:ml2:vlan
@@ -1789,6 +1787,9 @@
           - name: storage:block:ceph
           - name: storage:ephemeral:ceph
           - name: storage:image:ceph
+        incompatible:
+          - name: hypervisor:qemu
+            message: "Ceph not compatible with XenServer"
       - name: storage:ephemeral:ceph
         label: "dialog.create_cluster_wizard.storage.ceph"
         description: "dialog.create_cluster_wizard.storage.ceph_ephemeral"
@@ -1796,7 +1797,6 @@
         bind:
           - "settings:storage.ephemeral_ceph.value"
         compatible:
-          - name: hypervisor:qemu
           - name: hypervisor:vmware
           - name: network:neutron:core:ml2
           - name: network:neutron:ml2:vlan
@@ -1805,6 +1805,9 @@
           - name: storage:block:ceph
           - name: storage:object:ceph
           - name: storage:image:ceph
+        incompatible:
+          - name: hypervisor:qemu
+            message: "Ceph not compatible with XenServer"
       - name: storage:image:ceph
         label: "dialog.create_cluster_wizard.storage.ceph"
         description: "dialog.create_cluster_wizard.storage.ceph_image"
@@ -1812,7 +1815,6 @@
         bind:
           - "settings:storage.images_ceph.value"
         compatible:
-          - name: hypervisor:qemu
           - name: hypervisor:vmware
           - name: network:neutron:core:ml2
           - name: network:neutron:ml2:vlan
@@ -1821,6 +1823,9 @@
           - name: storage:block:ceph
           - name: storage:object:ceph
           - name: storage:ephemeral:ceph
+        incompatible:
+          - name: hypervisor:qemu
+            message: "Ceph not compatible with XenServer"
       - name: additional_service:sahara
         bind:
           - "settings:additional_components.sahara.value"
@@ -1828,7 +1833,6 @@
         label: "dialog.create_cluster_wizard.additional.install_sahara"
         description: "dialog.create_cluster_wizard.additional.install_sahara_description"
         compatible:
-          - name: hypervisor:qemu
           - name: hypervisor:vmware
           - name: network:neutron:core:ml2
           - name: network:neutron:ml2:vlan
@@ -1842,6 +1846,9 @@
           - name: additional_service:murano
           - name: additional_service:ceilometer
           - name: additional_service:ironic
+        incompatible:
+          - name: hypervisor:qemu
+            message: "Sahara not compatible with XenServer"
       - name: additional_service:murano
         bind:
           - "settings:additional_components.murano.value"
@@ -1849,7 +1856,6 @@
         label: "dialog.create_cluster_wizard.additional.install_murano"
         description: "dialog.create_cluster_wizard.additional.install_murano_description"
         compatible:
-          - name: hypervisor:qemu
           - name: hypervisor:vmware
           - name: network:neutron:core:ml2
           - name: network:neutron:ml2:vlan
@@ -1862,6 +1868,9 @@
           - name: additional_service:sahara
           - name: additional_service:ceilometer
           - name: additional_service:ironic
+        incompatible:
+          - name: hypervisor:qemu
+            message: "Murano not compatible with XenServer"
       - name: additional_service:ceilometer
         bind:
           - "settings:additional_components.ceilometer.value"
@@ -1869,7 +1878,6 @@
         label: "dialog.create_cluster_wizard.additional.install_ceilometer"
         description: "dialog.create_cluster_wizard.additional.install_ceilometer_description"
         compatible:
-          - name: hypervisor:qemu
           - name: hypervisor:vmware
           - name: network:neutron:core:ml2
           - name: network:neutron:ml2:vlan
@@ -1882,6 +1890,9 @@
           - name: additional_service:sahara
           - name: additional_service:murano
           - name: additional_service:ironic
+        incompatible:
+          - name: hypervisor:qemu
+            message: "Ceilometer not compatible with XenServer"
       - name: additional_service:ironic
         bind:
           - "settings:additional_components.ironic.value"
@@ -1889,7 +1900,6 @@
         label: "dialog.create_cluster_wizard.additional.install_ironic"
         description: "dialog.create_cluster_wizard.additional.install_ironic_description"
         compatible:
-          - name: hypervisor:qemu
           - name: network:neutron:core:ml2
           - name: network:neutron:ml2:vlan
           - name: storage:block:lvm
@@ -1903,86 +1913,14 @@
         incompatible:
           - name: network:neutron:ml2:tun
             message: "dialog.create_cluster_wizard.additional.ironic_network_mode_alert"
+          - name: hypervisor:qemu
+            message: "Ironic not compatible with XenServer"
     modes: ['ha_compact']
     extensions: ['volume_manager']
-- pk: 1
-  extend: *base_release
-  fields:
-    name: "Liberty on CentOS 6.5"
-    state: "unavailable"
-    version: "liberty-8.0"
-    can_update_from_versions: []
-    operating_system: "CentOS"
-    description: "This option will install the OpenStack Liberty packages using a CentOS based operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment."
-    attributes_metadata:
-      editable:
-        kernel_params:
-          kernel:
-            value: "console=tty0 biosdevname=0 crashkernel=none rootdelay=90 nomodeset"
-        use_fedora_lt:
-          metadata:
-            label: "Use Fedora longterm kernel"
-            weight: 50
-          kernel:
-            label: "Select kernel"
-            weight: 55
-            type: "radio"
-            value: "default_kernel"
-            values:
-              - data: "default_kernel"
-                label: "CentOS default kernel"
-                description: "Install default 2.6.32 kernel."
-              - data: "fedora_lt_kernel"
-                label: "Fedora LT kernel"
-                description: "EXPERIMENTAL: Install the Fedora 3.10 longterm kernel instead of the default 2.6.32 kernel. This kernel may not work with all hardware platforms, use with caution."
-        repo_setup:
-          metadata:
-            label: "Repositories"
-            weight: 50
-            group: "general"
-            always_editable: true
-          repos:
-            type: "custom_repo_configuration"
-            extra_priority: null
-            description: |
-              To create a local repository mirror on the Fuel master node, please follow the instructions provided by running "fuel-package-updates --help" on the Fuel master node.
-              Please make sure your Fuel master node has Internet access to the repository before attempting to create a mirror.
-              For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-8.0/reference-architecture.html#fuel-rep-mirror).
-            value:
-              - type: "rpm"
-                name: "mos"
-                uri: "http://{settings.MASTER_IP}:8080/{cluster.release.version}/centos/x86_64"
-                priority: null
-              - type: "rpm"
-                name: "mos-updates"
-                uri: "http://mirror.fuel-infra.org/mos-repos/centos/mos{cluster.release.environment_version}-centos7-fuel/updates/x86_64"
-                priority: null
-              - type: "rpm"
-                name: "mos-security"
-                uri: "http://mirror.fuel-infra.org/mos-repos/centos/mos{cluster.release.environment_version}-centos7-fuel/security/x86_64"
-                priority: null
-              - type: "rpm"
-                name: "Auxiliary"
-                uri: "http://{settings.MASTER_IP}:8080/{cluster.release.version}/centos/auxiliary"
-                priority: 15
-      generated:
-        cobbler:
-          profile:
-            generator_arg: "centos-x86_64"
-        provision:
-          image_data:
-            /:
-              uri: "http://{settings.MASTER_IP}:8080/targetimages/centos_65_x86_64.img.gz"
-              format: "ext4"
-              container: "gzip"
-            /boot:
-              uri: "http://{settings.MASTER_IP}:8080/targetimages/centos_65_x86_64-boot.img.gz"
-              format: "ext2"
-              container: "gzip"
-- pk: 2
+- pk: 9
   extend: *base_release
   fields:
-    name: "Liberty on Ubuntu 14.04"
+    name: "Liberty+Citrix XenServer on Ubuntu 14.04"
     version: "liberty-8.0"
     can_update_from_versions: []
     operating_system: "Ubuntu"