diff options
Diffstat (limited to 'patches/fuel-web')
10 files changed, 70 insertions, 66 deletions
diff --git a/patches/fuel-web/0001-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch b/patches/fuel-web/0001-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch index f3b9ea70..6dee64d9 100644 --- a/patches/fuel-web/0001-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch +++ b/patches/fuel-web/0001-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch @@ -7,14 +7,14 @@ Add the following Openstack releases: - Mitaka on Ubuntu 14.04 (aarch64) - Mitaka on Ubuntu+UCA 14.04 (aarch64) -Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> +Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- nailgun/nailgun/fixtures/openstack.yaml | 287 ++++++++++++++++++++++++++++++++ 1 file changed, 287 insertions(+) diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml -index 62e6b73..9674d66 100644 +index d08a4fc..65646d4 100644 --- a/nailgun/nailgun/fixtures/openstack.yaml +++ b/nailgun/nailgun/fixtures/openstack.yaml @@ -2314,3 +2314,290 @@ 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 d621dbdf..0435891e 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 @@ -1,4 +1,4 @@ -From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> +From: Stanislaw Kardach <stanislaw.kardach@cavium.com> Date: Wed, 24 Feb 2016 20:11:54 +0100 Subject: [PATCH] Add arch to nailgun release and target image @@ -10,23 +10,23 @@ As a bonus, it is also used when building the target image. .../alembic_migrations/versions/armband.py | 53 ++++++++++++++++++++++ nailgun/nailgun/db/sqlalchemy/models/release.py | 8 ++++ nailgun/nailgun/fixtures/openstack.yaml | 5 ++ - .../nailgun/orchestrator/deployment_serializers.py | 9 +++- + .../nailgun/orchestrator/deployment_serializers.py | 8 +++- .../orchestrator/provisioning_serializers.py | 3 +- nailgun/nailgun/orchestrator/tasks_templates.py | 5 +- .../integration/test_cluster_changes_handler.py | 12 ++--- .../integration/test_orchestrator_serializer.py | 4 +- nailgun/nailgun/test/unit/test_tasks_templates.py | 6 ++- - 10 files changed, 96 insertions(+), 14 deletions(-) + 10 files changed, 95 insertions(+), 14 deletions(-) create mode 100644 nailgun/nailgun/db/migration/alembic_migrations/versions/armband.py diff --git a/nailgun/nailgun/consts.py b/nailgun/nailgun/consts.py -index 1ded0ba..5a1af0a 100644 +index 4900ec0..59b0c91 100644 --- a/nailgun/nailgun/consts.py +++ b/nailgun/nailgun/consts.py @@ -38,6 +38,11 @@ RELEASE_OS = Enum( ) ) - + +RELEASE_ARCHS = Enum( + 'amd64', + 'arm64' @@ -37,7 +37,7 @@ index 1ded0ba..5a1af0a 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..8cca69c +index 0000000..6e42b3f --- /dev/null +++ b/nailgun/nailgun/db/migration/alembic_migrations/versions/armband.py @@ -0,0 +1,53 @@ @@ -114,10 +114,10 @@ index 1b47de4..e209e72 100644 operating_system = Column(String(50), nullable=False) state = Column( diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml -index 9674d66..d3226da 100644 +index 65646d4..874d4f0 100644 --- a/nailgun/nailgun/fixtures/openstack.yaml +++ b/nailgun/nailgun/fixtures/openstack.yaml -@@ -1904,6 +1904,7 @@ +@@ -1907,6 +1907,7 @@ name: "Mitaka on CentOS 6.5" state: "unavailable" version: "mitaka-9.0" @@ -125,7 +125,7 @@ index 9674d66..d3226da 100644 operating_system: "CentOS" description: "This option will install the OpenStack Mitaka packages using a CentOS based operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment." attributes_metadata: -@@ -1978,6 +1979,7 @@ +@@ -1980,6 +1981,7 @@ fields: name: "Mitaka on Ubuntu 14.04" version: "mitaka-9.0" @@ -133,7 +133,7 @@ index 9674d66..d3226da 100644 operating_system: "Ubuntu" description: "This option will install the OpenStack Mitaka packages using Ubuntu as a base operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment." attributes_metadata: -@@ -2219,6 +2221,7 @@ +@@ -2220,6 +2222,7 @@ fields: name: "Mitaka on Ubuntu+UCA 14.04" version: "mitaka-9.0" @@ -158,7 +158,7 @@ index 9674d66..d3226da 100644 attributes_metadata: editable: diff --git a/nailgun/nailgun/orchestrator/deployment_serializers.py b/nailgun/nailgun/orchestrator/deployment_serializers.py -index 699a599..6bb7990 100644 +index 08eb9c3..e561324 100644 --- a/nailgun/nailgun/orchestrator/deployment_serializers.py +++ b/nailgun/nailgun/orchestrator/deployment_serializers.py @@ -300,7 +300,13 @@ class DeploymentMultinodeSerializer(object): @@ -173,11 +173,11 @@ index 699a599..6bb7990 100644 + arch = "aarch64" + image_data['img_path'] = '{0}cirros-{1}-disk.img'.format(img_dir, + arch) - + glance_properties = [] - + diff --git a/nailgun/nailgun/orchestrator/provisioning_serializers.py b/nailgun/nailgun/orchestrator/provisioning_serializers.py -index 48a4753..b1f3ca6 100644 +index 48a4753..aaac22a 100644 --- a/nailgun/nailgun/orchestrator/provisioning_serializers.py +++ b/nailgun/nailgun/orchestrator/provisioning_serializers.py @@ -307,7 +307,8 @@ class ProvisioningSerializer61(ProvisioningSerializer): @@ -187,7 +187,7 @@ index 48a4753..b1f3ca6 100644 - packages)) + packages, + cluster.release.arch)) - + # NOTE(kozhukalov): This pre-provision task is going to be # removed by 7.0 because we need this only for classic way of diff --git a/nailgun/nailgun/orchestrator/tasks_templates.py b/nailgun/nailgun/orchestrator/tasks_templates.py @@ -195,8 +195,8 @@ index 51dfdf7..bc2bff9 100644 --- a/nailgun/nailgun/orchestrator/tasks_templates.py +++ b/nailgun/nailgun/orchestrator/tasks_templates.py @@ -210,7 +210,7 @@ def make_reboot_task(uids, task): - - + + def make_provisioning_images_task( - uids, repos, provision_data, cid, packages): + uids, repos, provision_data, cid, packages, arch): @@ -212,63 +212,63 @@ index 51dfdf7..bc2bff9 100644 + "--input_data '{2}'").format(cid, arch, conf), 'timeout': settings.PROVISIONING_IMAGES_BUILD_TIMEOUT, 'retries': 1}}) - + diff --git a/nailgun/nailgun/test/integration/test_cluster_changes_handler.py b/nailgun/nailgun/test/integration/test_cluster_changes_handler.py -index 0f212e5..da50eac 100644 +index fb82be0..450155d 100644 --- a/nailgun/nailgun/test/integration/test_cluster_changes_handler.py +++ b/nailgun/nailgun/test/integration/test_cluster_changes_handler.py -@@ -153,7 +153,7 @@ class TestHandlers(BaseIntegrationTest): +@@ -154,7 +154,7 @@ class TestHandlers(BaseIntegrationTest): common_attrs['last_controller'] = controller_nodes[-1]['name'] common_attrs['storage']['pg_num'] = 128 - + - common_attrs['test_vm_image'] = { + common_attrs['test_vm_image'] = [{ 'container_format': 'bare', 'public': 'true', 'disk_format': 'qcow2', -@@ -165,7 +165,7 @@ class TestHandlers(BaseIntegrationTest): +@@ -166,7 +166,7 @@ class TestHandlers(BaseIntegrationTest): """--property murano_image_info=""" """'{"title": "Murano Demo", "type": "cirros.demo"}'""" ), - } + }] - + critical_mapping = { 'primary-controller': True, -@@ -565,7 +565,7 @@ class TestHandlers(BaseIntegrationTest): +@@ -566,7 +566,7 @@ class TestHandlers(BaseIntegrationTest): common_attrs['last_controller'] = controller_nodes[-1]['name'] common_attrs['storage']['pg_num'] = 128 - + - common_attrs['test_vm_image'] = { + common_attrs['test_vm_image'] = [{ 'container_format': 'bare', 'public': 'true', 'disk_format': 'qcow2', -@@ -577,7 +577,7 @@ class TestHandlers(BaseIntegrationTest): +@@ -578,7 +578,7 @@ class TestHandlers(BaseIntegrationTest): """--property murano_image_info=""" """'{"title": "Murano Demo", "type": "cirros.demo"}'""" ), - } + }] - + critical_mapping = { 'primary-controller': True, -@@ -1049,7 +1049,7 @@ class TestHandlers(BaseIntegrationTest): +@@ -1050,7 +1050,7 @@ class TestHandlers(BaseIntegrationTest): common_attrs['last_controller'] = controller_nodes[-1]['name'] common_attrs['storage']['pg_num'] = 128 - + - common_attrs['test_vm_image'] = { + common_attrs['test_vm_image'] = [{ 'container_format': 'bare', 'public': 'true', 'disk_format': 'qcow2', -@@ -1061,7 +1061,7 @@ class TestHandlers(BaseIntegrationTest): +@@ -1062,7 +1062,7 @@ class TestHandlers(BaseIntegrationTest): """--property murano_image_info=""" """'{"title": "Murano Demo", "type": "cirros.demo"}'""" ), - } + }] - + critical_mapping = { 'primary-controller': True, diff --git a/nailgun/nailgun/test/integration/test_orchestrator_serializer.py b/nailgun/nailgun/test/integration/test_orchestrator_serializer.py @@ -276,22 +276,22 @@ index 5db8f4e..ef208cb 100644 --- a/nailgun/nailgun/test/integration/test_orchestrator_serializer.py +++ b/nailgun/nailgun/test/integration/test_orchestrator_serializer.py @@ -2584,12 +2584,12 @@ class BaseDeploymentSerializer(BaseSerializerTest): - + def check_no_murano_data(self): glance_properties = self.serializer.generate_test_vm_image_data( - self.env.nodes[0])['test_vm_image']['glance_properties'] + self.env.nodes[0])['test_vm_image'][0]['glance_properties'] self.assertNotIn('murano_image_info', glance_properties) - + def check_murano_data(self): glance_properties = self.serializer.generate_test_vm_image_data( - self.env.nodes[0])['test_vm_image']['glance_properties'] + self.env.nodes[0])['test_vm_image'][0]['glance_properties'] self.assertIn('murano_image_info', glance_properties) - - + + diff --git a/nailgun/nailgun/test/unit/test_tasks_templates.py b/nailgun/nailgun/test/unit/test_tasks_templates.py -index 4e81a19..d657518 100644 +index 4e81a19..695e53d 100644 --- a/nailgun/nailgun/test/unit/test_tasks_templates.py +++ b/nailgun/nailgun/test/unit/test_tasks_templates.py @@ -140,7 +140,8 @@ class TestMakeTask(base.BaseTestCase): @@ -302,7 +302,7 @@ index 4e81a19..d657518 100644 + packages=packages, + arch='amd64' ) - + fuel_image_conf = { @@ -177,7 +178,8 @@ class TestMakeTask(base.BaseTestCase): cmd = result["parameters"]["cmd"].lstrip( @@ -312,5 +312,5 @@ index 4e81a19..d657518 100644 + "--data_driver nailgun_build_image --target_arch amd64" + " --input_data '").rstrip("'") self.assertEqual(jsonutils.loads(cmd), fuel_image_conf) - + def test_generate_ironic_bootstrap_keys_task(self): diff --git a/patches/fuel-web/cross-bootstrap/0000-Add-arch-to-nailgun-release-and-target-image.patch b/patches/fuel-web/cross-bootstrap/0000-Add-arch-to-nailgun-release-and-target-image.patch new file mode 120000 index 00000000..64ff45c3 --- /dev/null +++ b/patches/fuel-web/cross-bootstrap/0000-Add-arch-to-nailgun-release-and-target-image.patch @@ -0,0 +1 @@ +../0002-Add-arch-to-nailgun-release-and-target-image.patch
\ No newline at end of file diff --git a/patches/fuel-web/direct-kernel-boot/0000-Add-arch-to-nailgun-release-and-target-image.patch b/patches/fuel-web/direct-kernel-boot/0000-Add-arch-to-nailgun-release-and-target-image.patch new file mode 120000 index 00000000..64ff45c3 --- /dev/null +++ b/patches/fuel-web/direct-kernel-boot/0000-Add-arch-to-nailgun-release-and-target-image.patch @@ -0,0 +1 @@ +../0002-Add-arch-to-nailgun-release-and-target-image.patch
\ No newline at end of file diff --git a/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch b/patches/fuel-web/direct-kernel-boot/0001-direct-kernel-boot-for-cirros.patch index 994ad730..0f9395c3 100644 --- a/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch +++ b/patches/fuel-web/direct-kernel-boot/0001-direct-kernel-boot-for-cirros.patch @@ -1,4 +1,4 @@ -From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> +From: Stanislaw Kardach <stanislaw.kardach@cavium.com> Date: Tue, 15 Mar 2016 15:01:51 +0100 Subject: [PATCH] direct kernel boot for cirros @@ -8,11 +8,11 @@ Subject: [PATCH] direct kernel boot for cirros 2 files changed, 61 insertions(+), 23 deletions(-) diff --git a/nailgun/nailgun/orchestrator/base_serializers.py b/nailgun/nailgun/orchestrator/base_serializers.py -index 0643635..a2f43b0 100644 +index 2fb0da5..ac787ed 100644 --- a/nailgun/nailgun/orchestrator/base_serializers.py +++ b/nailgun/nailgun/orchestrator/base_serializers.py @@ -145,12 +145,16 @@ class MuranoMetadataSerializerMixin(object): - + def inject_murano_settings(self, image_data): """Adds murano metadata to the test image""" - test_vm_image = image_data['test_vm_image'] @@ -31,16 +31,16 @@ index 0643635..a2f43b0 100644 + murano_data + test_vm_images += [test_vm_image] + return {'test_vm_image': test_vm_images} - - + + class VmwareDeploymentSerializerMixin(object): diff --git a/nailgun/nailgun/orchestrator/deployment_serializers.py b/nailgun/nailgun/orchestrator/deployment_serializers.py -index 6bb7990..62fb08b 100644 +index e561324..601301b 100644 --- a/nailgun/nailgun/orchestrator/deployment_serializers.py +++ b/nailgun/nailgun/orchestrator/deployment_serializers.py @@ -283,6 +283,9 @@ class DeploymentMultinodeSerializer(object): return {'glance': {'image_cache_max_size': image_cache_max_size}} - + def generate_test_vm_image_data(self, node): + images = [] + # By default always prepare the disk image @@ -48,7 +48,7 @@ index 6bb7990..62fb08b 100644 # Instantiate all default values in dict. image_data = { 'container_format': 'bare', -@@ -306,8 +309,8 @@ class DeploymentMultinodeSerializer(object): +@@ -305,8 +308,8 @@ class DeploymentMultinodeSerializer(object): arch = "x86_64" elif arch == "arm64": arch = "aarch64" @@ -56,12 +56,12 @@ index 6bb7990..62fb08b 100644 - arch) + image_data['img_path'] = \ + '{0}cirros-{1}-disk.img'.format(img_dir, arch) - + glance_properties = [] - -@@ -322,8 +325,38 @@ class DeploymentMultinodeSerializer(object): + +@@ -321,8 +324,38 @@ class DeploymentMultinodeSerializer(object): glance_properties.append('--property hypervisor_type=vmware') - + image_data['glance_properties'] = ' '.join(glance_properties) + images += [image_data] + @@ -93,13 +93,13 @@ index 6bb7990..62fb08b 100644 + 'glance_properties': '', + } + images += [kernel_data, initrd_data] - + - return {'test_vm_image': image_data} + return {'test_vm_image': images} - + @classmethod def get_net_provider_serializer(cls, cluster): -@@ -522,20 +555,21 @@ class DeploymentHASerializer61(DeploymentHASerializer, +@@ -521,20 +554,21 @@ class DeploymentHASerializer61(DeploymentHASerializer, images_data['test_vm_image'] = [] if attrs.get('editable', {}).get('common', {}). \ get('use_vcenter', {}).get('value') is True: @@ -134,4 +134,4 @@ index 6bb7990..62fb08b 100644 + images_data['test_vm_image'] += image_data['test_vm_image'] else: images_data = image_data - + diff --git a/patches/fuel-web/0007-kernel-flavor-linux-image-generic-lts-xenial.patch b/patches/fuel-web/kernel-bump/0001-kernel-flavor-linux-image-generic-lts-xenial.patch index 5a068d6f..80189744 100644 --- a/patches/fuel-web/0007-kernel-flavor-linux-image-generic-lts-xenial.patch +++ b/patches/fuel-web/kernel-bump/0001-kernel-flavor-linux-image-generic-lts-xenial.patch @@ -12,10 +12,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml -index 9c34a05..6848424 100644 +index 874d4f0..c5087b6 100644 --- a/nailgun/nailgun/fixtures/openstack.yaml +++ b/nailgun/nailgun/fixtures/openstack.yaml -@@ -2103,8 +2103,8 @@ +@@ -2081,8 +2081,8 @@ i40e-dkms linux-firmware linux-firmware-nonfree @@ -26,7 +26,7 @@ index 9c34a05..6848424 100644 lvm2 mcollective mdadm -@@ -2447,8 +2447,8 @@ +@@ -2424,8 +2424,8 @@ i40e-dkms linux-firmware linux-firmware-nonfree diff --git a/patches/fuel-web/multiarch-fuel/0000-Add-arch-to-nailgun-release-and-target-image.patch b/patches/fuel-web/multiarch-fuel/0000-Add-arch-to-nailgun-release-and-target-image.patch new file mode 120000 index 00000000..64ff45c3 --- /dev/null +++ b/patches/fuel-web/multiarch-fuel/0000-Add-arch-to-nailgun-release-and-target-image.patch @@ -0,0 +1 @@ +../0002-Add-arch-to-nailgun-release-and-target-image.patch
\ No newline at end of file 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 new file mode 120000 index 00000000..e0d56a81 --- /dev/null +++ b/patches/fuel-web/multiarch-fuel/0000-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch @@ -0,0 +1 @@ +../0001-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch
\ No newline at end of file diff --git a/patches/fuel-web/0005-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 index 776ae32c..d76a1f6d 100644 --- a/patches/fuel-web/0005-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 @@ -13,10 +13,10 @@ 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 d3226da..7e6e96e 100644 +index c5087b6..ba25093 100644 --- a/nailgun/nailgun/fixtures/openstack.yaml +++ b/nailgun/nailgun/fixtures/openstack.yaml -@@ -1978,6 +1978,7 @@ +@@ -1980,6 +1980,7 @@ extend: *base_release fields: name: "Mitaka on Ubuntu 14.04" @@ -24,7 +24,7 @@ index d3226da..7e6e96e 100644 version: "mitaka-9.0" arch: "amd64" operating_system: "Ubuntu" -@@ -2220,6 +2221,7 @@ +@@ -2221,6 +2222,7 @@ extend: *ubuntu_release fields: name: "Mitaka on Ubuntu+UCA 14.04" diff --git a/patches/fuel-web/0006-Add-configuration-item-for-WSREP-SST-provider.patch b/patches/fuel-web/mysql-sst-provider/0001-Add-configuration-item-for-WSREP-SST-provider.patch index 87f0a2fd..2f63ec06 100644 --- a/patches/fuel-web/0006-Add-configuration-item-for-WSREP-SST-provider.patch +++ b/patches/fuel-web/mysql-sst-provider/0001-Add-configuration-item-for-WSREP-SST-provider.patch @@ -1,4 +1,4 @@ -From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> +From: Stanislaw Kardach <stanislaw.kardach@cavium.com> Date: Wed, 20 Apr 2016 15:05:15 -0700 Subject: [PATCH] Add configuration item for WSREP SST provider @@ -6,16 +6,16 @@ This patch adds a radio button in "OpenStack Services" tab of the environment settings to configure which WSREP SST provider to use for MySQL. -Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> +Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com> --- nailgun/nailgun/fixtures/openstack.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml -index 62e6b73..4b123b9 100644 +index ba25093..e855cf0 100644 --- a/nailgun/nailgun/fixtures/openstack.yaml +++ b/nailgun/nailgun/fixtures/openstack.yaml -@@ -918,6 +918,27 @@ +@@ -932,6 +932,27 @@ description: "Name for Mongo replication set" weight: 30 type: "text" |