diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-14 00:16:24 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-16 16:42:08 +0200 |
commit | 778b04fc90837e553bb5a2b7e85808b243c4f4b7 (patch) | |
tree | c8b4d29bd8e2c9968c806104260387062bfd5491 /patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch | |
parent | e6cb9ac354e25a9bdc6d99d34ca7bbf117015ed1 (diff) |
Rebase: p/fuel-web: Disable s/Liberty/Mitaka/.
Update patch for disabling Opentack release(s).
Fuel now introduced <Mitaka on Ubuntu+UCA 14.04>,
so disable that too for x86_64.
Change-Id: I431357bfc6edd3ae0b2567ee5b59c4a1b4deb9b2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch')
-rw-r--r-- | patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch | 24 |
1 files changed, 0 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: [] |