Merge "Uplift Armband to Fuel Newton"

3 files changed, 9 insertions, 11 deletions

diff --git a/patches/fuel-web/multiarch-fuel/0000-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch b/patches/fuel-web/multiarch-fuel/0000-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch
deleted file mode 120000
index e0d56a81..00000000
--- a/patches/fuel-web/multiarch-fuel/0000-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch
+++ /dev/null
@@ -1 +0,0 @@
-../0001-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch
\ No newline at end of file
diff --git a/patches/fuel-web/multiarch-fuel/0000-nailgun-Add-AArch64-Openstack-Newton-release-s.patch b/patches/fuel-web/multiarch-fuel/0000-nailgun-Add-AArch64-Openstack-Newton-release-s.patch
new file mode 120000
index 00000000..2e9288ee
--- /dev/null
+++ b/patches/fuel-web/multiarch-fuel/0000-nailgun-Add-AArch64-Openstack-Newton-release-s.patch
@@ -0,0 +1 @@
+../0001-nailgun-Add-AArch64-Openstack-Newton-release-s.patch
\ No newline at end of file
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-Newton-on-Ubuntu-for-now.patch
index d76a1f6d..4c7d70e7 100644
--- 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-Newton-on-Ubuntu-for-now.patch
@@ -1,9 +1,9 @@
 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.
+Subject: [PATCH] FIXME: Disable amd64 Newton 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>
+releases <Newton on Ubuntu 16.04> and <Newton on Ubuntu+UCA 16.04>
 (both x86_64) in openstack.yaml fixture.
 
 TODO: Propose renaming above releases to include arch in name.
@@ -13,22 +13,20 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  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"
+     name: "Newton on Ubuntu 16.04"
 +    state: "unavailable"
-     version: "mitaka-9.0"
+     version: "newton-10.0"
      arch: "amd64"
      operating_system: "Ubuntu"
-@@ -2221,6 +2222,7 @@
-   extend: *ubuntu_release
+@@ -2221,5 +2222,6 @@
    fields:
-     name: "Mitaka on Ubuntu+UCA 14.04"
+     name: "Newton on Ubuntu+UCA 16.04"
 +    state: "unavailable"
-     version: "mitaka-9.0"
+     version: "newton-10.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."
+     description: "This option will install the OpenStack Newton 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."