p/fuel: Fix ga-16.04 MaaS kernel to be hwe-edge

While at it, bump & rebase for ODL VM memory bump & Pike staging PPA,
handle architecture list for pike-staging PPA.

Change-Id: I13cdeef0ae2167ff1b7e6dd9c188dfbdcf18d9a1
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit da4a72b2ee47253ae763752254fbd049155d941e)

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 ef8d0f9..cd3f8db 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
@@ -208,13 +208,13 @@ index 5bbe0fe4..84b392e6 100644
            net_profile: default_ext
        cluster:
 diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2
-index 81135d6a..36908b18 100644
+index 5fc4776d..b19789e3 100644
 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2
 +++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2
 @@ -19,6 +19,9 @@ parameters:
          opendaylight.server:
            cpu: 4
-           ram: 6144
+           ram: 8192
 +          hw_firmware_type: uefi
 +          virt_machine_model: virt
 +          cpu_model: host-passthrough

diff --git a/patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
index 3461bb2..cc41beb 100644 (file)
--- a/patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
+++ b/patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
@@ -10,20 +10,28 @@ From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 Date: Wed, 30 Aug 2017 22:15:07 +0200
 Subject: [PATCH] baremetal, virtual: Extend arch list for UCA repo
 
+While at it, handle pike-staging PPA too.
+
 JIRA: https://jira.opnfv.org/browse/ARMBAND-304
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 | 2 +-
- mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 | 4 ++--
+ mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml  | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
-index 3b890da0..5b9d24e7 100644
+index 9db8f35d..026096b9 100644
 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
-@@ -251,7 +251,7 @@ parameters:
+@@ -251,12 +251,12 @@ parameters:
        repo:
+         uca-staging:
+           source: "deb http://ppa.launchpad.net/ubuntu-cloud-archive/${_param:openstack_version}-staging/ubuntu xenial main"
+-          architectures: amd64
++          architectures: amd64,arm64
+           key_id: 9F68104E
+           key_server: keyserver.ubuntu.com
          uca:
            source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
 -          architectures: amd64
@@ -32,11 +40,18 @@ index 3b890da0..5b9d24e7 100644
            key_server: keyserver.ubuntu.com
        kernel:
 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
-index 46d7af4a..076f38a9 100644
+index cef0b531..c3642b50 100644
 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
-@@ -96,7 +96,7 @@ parameters:
-       repo:
+@@ -97,13 +97,13 @@ parameters:
+         uca-staging:
+           # yamllint disable rule:line-length
+           source: "deb http://ppa.launchpad.net/ubuntu-cloud-archive/${_param:openstack_version}-staging/ubuntu xenial main"
+-          architectures: amd64
++          architectures: amd64,arm64
+           key_id: 9F68104E
+           key_server: keyserver.ubuntu.com
+           # yamllint enable rule:line-length
          uca:
            source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
 -          architectures: amd64

diff --git a/patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch b/patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch
index 28388d4..3432e85 100644 (file)
--- a/patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch
+++ b/patches/opnfv-fuel/0013-Revert-Get-back-to-the-GA-kernel.patch
@@ -10,10 +10,12 @@ 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 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 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 226a4f66..a2987423 100644
@@ -28,3 +30,13 @@ index 226a4f66..a2987423 100644
    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/upstream/fuel b/upstream/fuel
index f3314c7..3fdf9a9 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit f3314c74504d8bc324211cd60241674f1998efd4
+Subproject commit 3fdf9a951e8c7f5387b90d020ea6db38d85f3dd4