u/fuel: Bump & rebase for lab proxy support

While at it, fix MaaS hwe_kernel for AArch64 by switching back to
4.13.

Change-Id: Idb123eab370ef453b60ddb1dff40c2d8d7fd42c4
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
index 917e634..9f68465 100644 (file)
--- a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
@@ -66,7 +66,7 @@ index bcb7807..09b84b9 100755
 +
 +salt -I 'nova:compute' state.sls armband
 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 0607b31..ab026ef 100755
+index 75347d9..8b162d5 100755
 --- a/mcp/config/states/virtual_control_plane
 +++ b/mcp/config/states/virtual_control_plane
 @@ -27,6 +27,7 @@ if [ "${ERASE_ENV}" -eq 1 ]; then

diff --git a/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch
index 66e4b7d..fcfbfe6 100644 (file)
--- a/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch
+++ b/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch
@@ -82,7 +82,7 @@ index 7e3a494..3a240b0 100644
 -            external_address: 10.16.0.106
 +            external_address: 10.0.9.106
 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
-index 89b06fb..0086470 100644
+index d5606b5..508d5e1 100644
 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
 +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
 @@ -14,7 +14,7 @@ parameters:

diff --git a/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
index ca3ca2a..997c18d 100644 (file)
--- a/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
+++ b/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
@@ -33,10 +33,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls
-index 30c337c..f62ce5c 100644
+index 1f04750..45aed3d 100644
 --- a/mcp/salt-formulas/opendaylight/server.sls
 +++ b/mcp/salt-formulas/opendaylight/server.sls
-@@ -79,4 +79,9 @@ opendaylight:
+@@ -85,4 +85,9 @@ opendaylight:
        - service: opendaylight
  {%- endif %}
 

diff --git a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
index 3c5186d..ffcb136 100644 (file)
--- a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
+++ b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
@@ -66,19 +66,19 @@ index 0000000..0368937
 +   file.managed:
 +   - source: salt://maas/files/pgpass
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 284f1bc..533500d 100644
+index 1b3bfea..c460abb 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -16,3 +16,4 @@
- /usr/share/salt-formulas/env: 0009-controller-Use-keystoneclient-to-check-project-ID.patch
+@@ -17,3 +17,4 @@
  /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
+ /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch
  /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
 +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
-index 325e063..69717a2 100644
+index da28abf..65e6557 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
-@@ -39,6 +39,42 @@ parameters:
+@@ -40,6 +40,42 @@ parameters:
          enable_third_party_drivers: true
          network_discovery: 'enabled'
          default_min_hwe_kernel: ${_param:hwe_kernel}

diff --git a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index 77eae10..3a39eac 100644 (file)
--- a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
@@ -41,10 +41,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  create mode 100644 mcp/salt-formulas/armband/salt_minion.sls
 
 diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
-index 9718a41..5879b0d 100755
+index cd254dd..fb20a81 100755
 --- a/mcp/config/states/baremetal_init
 +++ b/mcp/config/states/baremetal_init
-@@ -33,6 +33,7 @@ salt -C 'cmp*' state.apply linux.network || true
+@@ -32,6 +32,7 @@ salt -C 'cmp*' state.apply linux.network || true
  salt -C 'cmp*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \
    args='unset new_routers'
 

diff --git a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
index b801728..87bebcd 100644 (file)
--- a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -150,11 +150,11 @@ index 0000000..a9fe11b
 +
 + #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 533500d..6b202e7 100644
+index c460abb..7bb4321 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -17,3 +17,5 @@
- /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
+@@ -18,3 +18,5 @@
+ /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch
  /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
  /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
 +/usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch

diff --git a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch
index 2f05c28..78769cf 100644 (file)
--- a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch
+++ b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch
@@ -49,10 +49,10 @@ index 0000000..d40e63b
 +     cmd += 'else sh {0} -c /tmp {1}; fi'.format(
 +         os.path.join(tmppath, 'bootstrap-salt.sh'), arg)
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 6b202e7..3a1d815 100644
+index 7bb4321..f533061 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -19,3 +19,4 @@
+@@ -20,3 +20,4 @@
  /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
  /usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch
  /usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch

diff --git a/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
index fcde8e3..b2d084d 100644 (file)
--- a/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
+++ b/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
@@ -32,7 +32,7 @@ index 8f4edef..6a75099 100644
            key_server: keyserver.ubuntu.com
        kernel:
 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
-index 0086470..cf88e3d 100644
+index 508d5e1..0ef0d4b 100644
 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
 +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
 @@ -98,7 +98,7 @@ parameters:

diff --git a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch
index f30df1e..423395a 100644 (file)
--- a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch
@@ -22,7 +22,7 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
  create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
 
 diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
-index 5879b0d..b34aa33 100755
+index fb20a81..a174640 100755
 --- a/mcp/config/states/baremetal_init
 +++ b/mcp/config/states/baremetal_init
 @@ -23,6 +23,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
@@ -32,9 +32,9 @@ index 5879b0d..b34aa33 100755
 +salt -C 'kvm* or cmp*' state.apply opnfv.adduser
  salt -C 'kvm*' state.apply linux.network
  salt -C 'kvm* or cmp*' state.apply salt.minion
- salt -C 'kvm* or cmp*' service.force_reload salt-minion
+ salt -C 'cmp*' state.apply linux.system
 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index ab026ef..4212b8e 100755
+index 8b162d5..849a4bc 100755
 --- a/mcp/config/states/virtual_control_plane
 +++ b/mcp/config/states/virtual_control_plane
 @@ -49,6 +49,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do

diff --git a/patches/opnfv-fuel/0014-Revert-Get-back-to-the-GA-kernel.patch b/patches/opnfv-fuel/0014-Revert-Get-back-to-the-GA-kernel.patch
new file mode 100644 (file)
index 0000000..d27e446
--- /dev/null
+++ b/patches/opnfv-fuel/0014-Revert-Get-back-to-the-GA-kernel.patch
@@ -0,0 +1,30 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2017 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 reverts commit d06bcfb72c44b507c3efee4de00f415869f48450.
+---
+ mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
+index 65e6557..8794b85 100644
+--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
++++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
+@@ -24,7 +24,7 @@ parameters:
+     maas_db_password: opnfv_secret
+     dns_server01: ${_param:opnfv_dns_server01}
+     single_address: ${_param:infra_maas_node01_deploy_address}
+-    hwe_kernel: 'ga-16.04'
++    hwe_kernel: 'hwe-16.04-edge'
+   maas:
+     region:
+       salt_master_ip: ${_param:reclass_config_master}

diff --git a/upstream/fuel b/upstream/fuel
index d06bcfb..bb3b696 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit d06bcfb72c44b507c3efee4de00f415869f48450
+Subproject commit bb3b6968dbccb74959d394fb6426ba5b8fb2c5e3