u/fuel: Bump & rebase for neutron trunk ports 85/47285/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 15 Nov 2017 18:52:17 +0000 (19:52 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 15 Nov 2017 18:52:59 +0000 (19:52 +0100)
Change-Id: Ibb55ee7fe4b615114ae0d6b91bc3e77270f90d92
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch
patches/opnfv-fuel/0012-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
upstream/fuel

index 848b1ff..8be2e80 100644 (file)
@@ -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
index 684f45c..844b052 100644 (file)
@@ -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:
index 15c1c19..3bc5d32 100644 (file)
@@ -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"
index 40f9072..bed4865 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 40f907255380dbfc4d808d9f3c768db80c4c8158
+Subproject commit bed48658ab74621497baec331d7cdd2c1ef51062