aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-15 19:52:17 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-16 16:43:13 +0000
commit59e383882c027befc50dbd6ef9d59a7e26815183 (patch)
treef70fcb15d9c576b07b21d91e0416df2e5047ef0b
parent7165de92fe49627194cf2fabc0474fb28464f2b0 (diff)
u/fuel: Bump & rebase for neutron trunk ports
Change-Id: Ibb55ee7fe4b615114ae0d6b91bc3e77270f90d92 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 62cfd8427eb065932cff09ca42017ecf7a480a1d)
-rw-r--r--patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch2
-rw-r--r--patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch2
-rw-r--r--patches/opnfv-fuel/0012-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch4
m---------upstream/fuel0
4 files changed, 4 insertions, 4 deletions
diff --git a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
index 848b1ff..8be2e80 100644
--- a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
@@ -58,7 +58,7 @@ index 19cd417..73983d2 100755
+
+salt -I 'nova:compute' state.sls armband || true
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index c3a51a8..41c8560 100755
+index 9eaa3a1..2439ad6 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
diff --git a/patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch
index 684f45c..844b052 100644
--- a/patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch
+++ b/patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch
@@ -20,7 +20,7 @@ Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
-index 7d3dcb0..3685836 100644
+index 30dda2f..653a9d7 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
@@ -12,8 +12,8 @@ classes:
diff --git a/patches/opnfv-fuel/0012-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0012-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
index 15c1c19..3bc5d32 100644
--- a/patches/opnfv-fuel/0012-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
+++ b/patches/opnfv-fuel/0012-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
@@ -61,10 +61,10 @@ index 5e855ac..2392cf0 100644
key_server: keyserver.ubuntu.com
kernel:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
-index 4a48b36..1e84493 100644
+index ad06754..d4e1c40 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
-@@ -64,7 +64,7 @@ parameters:
+@@ -65,7 +65,7 @@ parameters:
repo:
uca:
source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
diff --git a/upstream/fuel b/upstream/fuel
-Subproject 40f907255380dbfc4d808d9f3c768db80c4c815
+Subproject bed48658ab74621497baec331d7cdd2c1ef5106