Merge "Cleanup: rm TODO, fix license header." into stable/brahmaputra

5 files changed, 7 insertions, 36 deletions

diff --git a/TODO.md b/TODO.md
deleted file mode 100644
index ae2da275..00000000
--- a/TODO.md
+++ /dev/null
@@ -1,29 +0,0 @@
-List of missing features and things to do
-=========================================
-
-Cleanup tasks
-=========================================
-* [arm64-master] Fix license in ubuntu_1404_arm64.pp
-* [arm64-master] Look into default ubuntu_debootstrap change in cobbler.pp
-* [arm64-master] [fuel-agent] Package and repo update for arm64 in [2] (?)
-* [arm64-master] change docker repo in `upstream/fuel/build/config.mk`,
-  perhaps by figuring out current architecture with `uname -m`
-
-Needed for all arch support (todo, later)
-=========================================
-* [arm64-master] Extend arch list for auxiliary repo on fuel master
-  (e.g. "amd64 arm64", or "arm64" if people want to support arm64 only).
-  Use UBUNTU_ARCH in constructs like "for arch in arm64 amd64; do"
-* [arm64-master] [fuel-agent] Custom package selection for arm64 in [1] or from above
-* [arm64-master] Stop hardcoding grub-efi-arm64/grub-pc 
-* [fuel-main] deb/rpm building for arm64 support
-* [fuel-main] mirror arm64 support
-* [fuel] Figure a way for not hardcoding the bootstrap image architecture,
-  preferably selectable using fuel-menu
-
-Needed for aarch64 Fuel Master support
-=========================================
-* [arm64-master] Add arm64 support for CentOS based actions.
-
-[1] https://github.com/openstack/fuel-agent/blob/master/fuel_agent/drivers/nailgun.py#L687-L693
-[2] https://github.com/openstack/fuel-agent/blob/master/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/settings.yaml.sample#L19
diff --git a/patches/fuel-web/0001-Add-arm64-fixture.patch b/patches/fuel-web/0001-nailgun-Add-arm64-fixture.patch
index 95281c8c..5fea498e 100644
--- a/patches/fuel-web/0001-Add-arm64-fixture.patch
+++ b/patches/fuel-web/0001-nailgun-Add-arm64-fixture.patch
@@ -1,13 +1,13 @@
 From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
 Date: Sun, 21 Feb 2016 16:30:43 +0100
-Subject: [PATCH] Add arm64 fixture
+Subject: [PATCH] nailgun: Add arm64 fixture.
 
 ---
  nailgun/nailgun/fixtures/openstack.yaml | 99 +++++++++++++++++++++++++++++++++
  1 file changed, 99 insertions(+)
 
 diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
-index f9c8ab6..bf6f7c4 100644
+index f9c8ab6..a330f4e 100644
 --- a/nailgun/nailgun/fixtures/openstack.yaml
 +++ b/nailgun/nailgun/fixtures/openstack.yaml
 @@ -2079,3 +2079,102 @@
@@ -26,7 +26,7 @@ index f9c8ab6..bf6f7c4 100644
 +      editable:
 +        kernel_params:
 +          kernel:
-+            value: "console=ttyAMA0,115200 console=ttyS0,115200 net.ifnames=0 biosdevname=0 rootdelay=90 nomodeset"
++            value: "console=ttyAMA0,115200 console=ttyS0,115200 net.ifnames=1 biosdevname=0 rootdelay=90 nomodeset"
 +        repo_setup:
 +          metadata:
 +            label: "Repositories"
diff --git a/patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch b/patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch
index 7af57961..e411d66b 100644
--- a/patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch
+++ b/patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch
@@ -2,7 +2,7 @@ From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
 Date: Wed, 24 Feb 2016 20:11:54 +0100
 Subject: [PATCH] Add arch to nailgun release and target image
 
-Thsi is required so that the TestVM image is created using a cirros
+This is required so that the TestVM image is created using a cirros
 image that is compatible with the architecture of the deployment setup.
 As a bonus, it is also used when building the target image.
 ---
@@ -37,11 +37,11 @@ index bb69168..2c19ec9 100644
      'ha_full',
 diff --git a/nailgun/nailgun/db/migration/alembic_migrations/versions/armband.py b/nailgun/nailgun/db/migration/alembic_migrations/versions/armband.py
 new file mode 100644
-index 0000000..ad297b1
+index 0000000..8cca69c
 --- /dev/null
 +++ b/nailgun/nailgun/db/migration/alembic_migrations/versions/armband.py
 @@ -0,0 +1,53 @@
-+#    Copyright 2016 Mirantis, Inc.
++#    Copyright 2016 Cavium, Inc.
 +#
 +#    Licensed under the Apache License, Version 2.0 (the "License"); you may
 +#    not use this file except in compliance with the License. You may obtain
@@ -114,7 +114,7 @@ index 96cf2ed..62ac2c1 100644
                                        nullable=False, server_default='[]')
      description = Column(Unicode)
 diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
-index bf6f7c4..4979fb5 100644
+index a330f4e..9da1346 100644
 --- a/nailgun/nailgun/fixtures/openstack.yaml
 +++ b/nailgun/nailgun/fixtures/openstack.yaml
 @@ -1913,6 +1913,7 @@
diff --git a/patches/opnfv-fuel/0026-f_repobuild-Repeat-mirror-build-up-to-ten-times.patch b/patches/opnfv-fuel/0028-f_repobuild-Repeat-mirror-build-up-to-ten-times.patch
index 0b1f92f1..0b1f92f1 100644
--- a/patches/opnfv-fuel/0026-f_repobuild-Repeat-mirror-build-up-to-ten-times.patch
+++ b/patches/opnfv-fuel/0028-f_repobuild-Repeat-mirror-build-up-to-ten-times.patch
diff --git a/patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch b/patches/opnfv-fuel/0029-UX-Update-bootstrap-target-build-time-estimate.patch
index 9791f595..9791f595 100644
--- a/patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch
+++ b/patches/opnfv-fuel/0029-UX-Update-bootstrap-target-build-time-estimate.patch