2 files changed, 34 insertions, 24 deletions
diff --git a/patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch b/patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch
deleted file mode 100644
index da231cb4..00000000
--- a/patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Sat, 19 Mar 2016 19:02:15 +0100
-Subject: [PATCH] FIXME: Disable amd64 Liberty on Ubuntu for now.
-
-Until we fix all cohabitation of amd64 and arm64, disable Openstack
-release Liberty on Ubuntu (x86_64) in openstack.yaml fixture.
-
-TODO: maybe rename above fixture to include arch in name.
----
- nailgun/nailgun/fixtures/openstack.yaml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
-index 9da1346..f798830 100644
---- a/nailgun/nailgun/fixtures/openstack.yaml
-+++ b/nailgun/nailgun/fixtures/openstack.yaml
-@@ -1986,6 +1986,7 @@
-   extend: *base_release
-   fields:
-     name: "Liberty on Ubuntu 14.04"
-+    state: "unavailable"
-     version: "liberty-8.0"
-     arch: "amd64"
-     can_update_from_versions: []
diff --git a/patches/fuel-web/0005-FIXME-Disable-amd64-Mitaka-on-Ubuntu-for-now.patch b/patches/fuel-web/0005-FIXME-Disable-amd64-Mitaka-on-Ubuntu-for-now.patch
new file mode 100644
index 00000000..00f23f60
--- /dev/null
+++ b/patches/fuel-web/0005-FIXME-Disable-amd64-Mitaka-on-Ubuntu-for-now.patch
@@ -0,0 +1,34 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Sat, 19 Mar 2016 19:02:15 +0100
+Subject: [PATCH] FIXME: Disable amd64 Mitaka on Ubuntu for now.
+
+Until we fix all cohabitation of amd64 and arm64, disable Openstack
+releases <Mitaka on Ubuntu 14.04> and <Mitaka on Ubuntu+UCA 14.04>
+(both x86_64) in openstack.yaml fixture.
+
+TODO: Propose renaming above releases to include arch in name.
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ nailgun/nailgun/fixtures/openstack.yaml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
+index 62e6b73..7d7ffa6 100644
+--- a/nailgun/nailgun/fixtures/openstack.yaml
++++ b/nailgun/nailgun/fixtures/openstack.yaml
+@@ -1977,6 +1977,7 @@
+   extend: *base_release
+   fields:
+     name: "Mitaka on Ubuntu 14.04"
++    state: "unavailable"
+     version: "mitaka-9.0"
+     operating_system: "Ubuntu"
+     description: "This option will install the OpenStack Mitaka packages using Ubuntu as a base operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment."
+@@ -2218,6 +2219,7 @@
+   extend: *ubuntu_release
+   fields:
+     name: "Mitaka on Ubuntu+UCA 14.04"
++    state: "unavailable"
+     version: "mitaka-9.0"
+     description: "This option will install the OpenStack Mitaka packages using Ubuntu as a base operating system, including Ubuntu Cloud Archive OpenStack packages. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment."
+     attributes_metadata: