summaryrefslogtreecommitdiffstats
path: root/patches/fuel-web/multiarch-fuel/0001-FIXME-Disable-amd64-Mitaka-on-Ubuntu-for-now.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/fuel-web/multiarch-fuel/0001-FIXME-Disable-amd64-Mitaka-on-Ubuntu-for-now.patch')
-rw-r--r--patches/fuel-web/multiarch-fuel/0001-FIXME-Disable-amd64-Mitaka-on-Ubuntu-for-now.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/patches/fuel-web/multiarch-fuel/0001-FIXME-Disable-amd64-Mitaka-on-Ubuntu-for-now.patch b/patches/fuel-web/multiarch-fuel/0001-FIXME-Disable-amd64-Mitaka-on-Ubuntu-for-now.patch
deleted file mode 100644
index d76a1f6d..00000000
--- a/patches/fuel-web/multiarch-fuel/0001-FIXME-Disable-amd64-Mitaka-on-Ubuntu-for-now.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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 c5087b6..ba25093 100644
---- a/nailgun/nailgun/fixtures/openstack.yaml
-+++ b/nailgun/nailgun/fixtures/openstack.yaml
-@@ -1980,6 +1980,7 @@
- extend: *base_release
- fields:
- name: "Mitaka on Ubuntu 14.04"
-+ state: "unavailable"
- version: "mitaka-9.0"
- arch: "amd64"
- operating_system: "Ubuntu"
-@@ -2221,6 +2222,7 @@
- extend: *ubuntu_release
- fields:
- name: "Mitaka on Ubuntu+UCA 14.04"
-+ state: "unavailable"
- version: "mitaka-9.0"
- arch: "amd64"
- 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."