diff options
Diffstat (limited to 'patches/fuel-web')
| -rw-r--r-- | patches/fuel-web/0001-nailgun-Add-arm64-fixture.patch (renamed from patches/fuel-web/0001-Add-arm64-fixture.patch) | 6 | ||||
| -rw-r--r-- | patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch | 8 |
2 files changed, 7 insertions, 7 deletions
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 @@ |