aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-05-23 19:29:25 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-05-24 17:28:06 +0000
commit1e6be0b7a685fe5c3575bb49843dfa1a12c071fd (patch)
tree846f758d0791de6de25494415542081ad040ff0e
parente3cffc6ebd73510294a4e7db9c4c25d01738ed73 (diff)
u/fuel: Bump & rebase for maas.machines.storage
Change-Id: I22781c20f353a81e546b1d6de390e6c58b31a494 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 0bd1adfbf11d58414b96d0277386b039a3117a9e)
-rw-r--r--patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch13
-rw-r--r--patches/opnfv-fuel/0004-maas-boot-resources-Add-arm64-architecture.patch39
-rw-r--r--patches/opnfv-fuel/0004-mcp-salt-formulas-armband-Extend-libvirt_domain.patch (renamed from patches/opnfv-fuel/0005-mcp-salt-formulas-armband-Extend-libvirt_domain.patch)0
-rw-r--r--patches/opnfv-fuel/0005-virtng.py-virt.sls-Extend-libvirt_domain.patch (renamed from patches/opnfv-fuel/0006-virtng.py-virt.sls-Extend-libvirt_domain.patch)0
-rw-r--r--patches/opnfv-fuel/0006-Add-opnfv-user-to-the-deployment.patch (renamed from patches/opnfv-fuel/0007-Add-opnfv-user-to-the-deployment.patch)0
-rw-r--r--patches/opnfv-fuel/0007-Set-volume-name-in-source-file-to-sdX.patch (renamed from patches/opnfv-fuel/0009-Set-volume-name-in-source-file-to-sdX.patch)0
-rw-r--r--patches/opnfv-fuel/0008-Revert-Get-back-to-the-GA-kernel.patch42
-rw-r--r--patches/opnfv-fuel/0008-curtin-arm64-Fix-missing-newline.patch (renamed from patches/opnfv-fuel/0010-curtin-arm64-Fix-missing-newline.patch)0
m---------upstream/fuel0
9 files changed, 5 insertions, 89 deletions
diff --git a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
index a04780b..e228b80 100644
--- a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
@@ -44,7 +44,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
create mode 100644 mcp/salt-formulas/armband/vgabios.sls
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index a30f9af6..600aa76b 100755
+index 73c44bb6..4ac5d6d5 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -52,6 +52,7 @@ salt -I 'neutron:server' state.sls neutron -b 1
@@ -56,18 +56,15 @@ index a30f9af6..600aa76b 100755
salt -I 'redis:cluster:role:master' state.sls redis
salt -I 'redis:server' state.sls redis
diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
-index a266989a..77557caa 100755
+index 70db238b..52d643df 100755
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
-@@ -55,6 +55,8 @@ salt -I 'ceilometer:agent' state.sls ceilometer
+@@ -54,3 +54,5 @@ salt -I 'ceilometer:server' state.sls ceilometer
+ salt -I 'ceilometer:agent' state.sls ceilometer
salt -I 'horizon:server' state.sls horizon
-
-+salt -I 'nova:compute' state.sls armband
+
- # workaround for the pike horizon is missing css, FUEL-324
- salt -I 'horizon:server' file.symlink \
- /var/lib/openstack-dashboard/static \
++salt -I 'nova:compute' state.sls armband
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index c391cfe6..02a813c9 100755
--- a/mcp/config/states/virtual_control_plane
diff --git a/patches/opnfv-fuel/0004-maas-boot-resources-Add-arm64-architecture.patch b/patches/opnfv-fuel/0004-maas-boot-resources-Add-arm64-architecture.patch
deleted file mode 100644
index b13390f..0000000
--- a/patches/opnfv-fuel/0004-maas-boot-resources-Add-arm64-architecture.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Fri, 11 Aug 2017 00:07:29 +0200
-Subject: [PATCH] maas: boot-resources: Add arm64 architecture
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- mcp/patches/0003-maas-region-force-artifact-download.patch | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/mcp/patches/0003-maas-region-force-artifact-download.patch b/mcp/patches/0003-maas-region-force-artifact-download.patch
-index b61a3d1b..e38b6c1a 100644
---- a/mcp/patches/0003-maas-region-force-artifact-download.patch
-+++ b/mcp/patches/0003-maas-region-force-artifact-download.patch
-@@ -50,7 +50,7 @@ diff --git a/maas/files/maas-artifact-sync.sh b/maas/files/maas-artifact-sync.sh
- new file mode 100644
- --- /dev/null
- +++ b/maas/files/maas-artifact-sync.sh
--@@ -0,0 +1,20 @@
-+@@ -0,0 +1,25 @@
- +{%- from "maas/map.jinja" import region with context %}
- +#!/bin/bash
- +function wait_for {
-@@ -71,3 +71,8 @@ new file mode 100644
- +wait_for 90 "! maas opnfv boot-resources is-importing | grep -q 'true'"
- +maas opnfv rack-controllers import-boot-images || exit 3
- +wait_for 30 "test -d /var/lib/maas/boot-resources/current/ubuntu/amd64"
-++maas opnfv boot-source-selection update 1 1 arches='amd64' arches='arm64' || exit 4
-++maas opnfv boot-resources import || exit 2
-++wait_for 90 "! maas opnfv boot-resources is-importing | grep -q 'true'"
-++maas opnfv rack-controllers import-boot-images || exit 3
-++wait_for 30 "test -d /var/lib/maas/boot-resources/current/ubuntu/arm64"
diff --git a/patches/opnfv-fuel/0005-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0004-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index 07c447b..07c447b 100644
--- a/patches/opnfv-fuel/0005-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0004-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
diff --git a/patches/opnfv-fuel/0006-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0005-virtng.py-virt.sls-Extend-libvirt_domain.patch
index 09dda59..09dda59 100644
--- a/patches/opnfv-fuel/0006-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0005-virtng.py-virt.sls-Extend-libvirt_domain.patch
diff --git a/patches/opnfv-fuel/0007-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0006-Add-opnfv-user-to-the-deployment.patch
index a5196f3..a5196f3 100644
--- a/patches/opnfv-fuel/0007-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0006-Add-opnfv-user-to-the-deployment.patch
diff --git a/patches/opnfv-fuel/0009-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0007-Set-volume-name-in-source-file-to-sdX.patch
index 65d58a7..65d58a7 100644
--- a/patches/opnfv-fuel/0009-Set-volume-name-in-source-file-to-sdX.patch
+++ b/patches/opnfv-fuel/0007-Set-volume-name-in-source-file-to-sdX.patch
diff --git a/patches/opnfv-fuel/0008-Revert-Get-back-to-the-GA-kernel.patch b/patches/opnfv-fuel/0008-Revert-Get-back-to-the-GA-kernel.patch
deleted file mode 100644
index f570a9b..0000000
--- a/patches/opnfv-fuel/0008-Revert-Get-back-to-the-GA-kernel.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Mon, 22 Jan 2018 19:41:37 +0100
-Subject: [PATCH] Revert "Get back to the GA kernel"
-
-This partially reverts commit b3b4b2e1bcd42f4628e53796c3dab81151f56bc2
-This reverts commit d06bcfb72c44b507c3efee4de00f415869f48450.
----
- mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml | 2 +-
- mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
-index 238ae95a..3cdb8bf0 100644
---- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
-+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
-@@ -25,7 +25,7 @@ parameters:
- maas_db_password: opnfv_secret
- dns_server01: ${_param:opnfv_dns_server01}
- single_address: ${_param:infra_maas_node01_deploy_address}
-- hwe_kernel: 'hwe-16.04'
-+ hwe_kernel: 'hwe-16.04-edge'
- maas:
- region:
- salt_master_ip: ${_param:reclass_config_master}
-diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml
-index 6662f1fa..be18e212 100644
---- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml
-+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml
-@@ -11,4 +11,4 @@ classes:
- - cluster.mcp-pike-odl-ha.infra
- parameters:
- _param:
-- hwe_kernel: 'ga-16.04'
-+ hwe_kernel: 'hwe-16.04-edge'
diff --git a/patches/opnfv-fuel/0010-curtin-arm64-Fix-missing-newline.patch b/patches/opnfv-fuel/0008-curtin-arm64-Fix-missing-newline.patch
index 7d830cc..7d830cc 100644
--- a/patches/opnfv-fuel/0010-curtin-arm64-Fix-missing-newline.patch
+++ b/patches/opnfv-fuel/0008-curtin-arm64-Fix-missing-newline.patch
diff --git a/upstream/fuel b/upstream/fuel
-Subproject 1410fe255169da5f7abe4cf49293618f4d2df32
+Subproject dfe08086ac3d02a921bdd5cb3e52865396f1d77