u/fuel: Bump & rebase for PDF-based network config

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

13 files changed, 17 insertions, 133 deletions

diff --git a/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch
index 2ebf8ffa..1dc8f99b 100644
--- a/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch
+++ b/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch
@@ -84,7 +84,7 @@ index 3c3d526..e114ec2 100644
 -            external_address: 10.16.0.110
 +            external_address: 10.0.9.110
 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
-index 4f1c557..3784b7e 100644
+index 81f050f..b304c28 100644
 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
 @@ -14,7 +14,7 @@ parameters:
diff --git a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch
deleted file mode 100644
index c58585e0..00000000
--- a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: 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: Guillermo Herrero <guillermo.herrero@enea.com>
-Date: Mon, 9 Oct 2017 14:28:15 +0200
-Subject: [PATCH] classes: baremetal: AArch64: NIC adaptation
-
-AArch64 NIC adaptation for dual NIC boards with traffic separation
- -kvm nodes: added second trunk_nic
- -compute nodes: removed third external_nic
-
-Change-Id: Iae73670c7ec6080f420cf61e5f0a79f8424665c9
-Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
----
- .../cluster/baremetal-mcp-ocata-common/infra/kvm.yml      | 12 +++++++++---
- .../baremetal-mcp-ocata-common/openstack_compute.yml      | 15 ++++-----------
- 2 files changed, 13 insertions(+), 14 deletions(-)
-
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
-index ce81f42..b270e0f 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
-@@ -32,6 +32,7 @@ parameters:
-     keepalived_vip_interface: br-ctl
-     keepalived_vip_virtual_router_id: 69
-     deploy_nic: ${_param:opnfv_baremetal_primary_nic}
-+    trunk_nic: ${_param:opnfv_baremetal_secondary_nic}
-   salt:
-     control:
-       size:  # RAM 4096,8192,16384,32768,65536
-@@ -144,6 +145,11 @@ parameters:
-           netmask: 255.255.255.0
-           name: ${_param:deploy_nic}
-           noifupdown: true
-+        trunk:
-+          enabled: true
-+          type: eth
-+          proto: manual
-+          name: ${_param:trunk_nic}
-         br-mgmt:
-           enabled: true
-           proto: dhcp
-@@ -156,9 +162,9 @@ parameters:
-           enabled: true
-           proto: manual
-           type: vlan
--          name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
-+          name: ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
-           use_interfaces:
--            - ${_param:deploy_nic}
-+            - ${_param:trunk_nic}
-         br-ctl:
-           enabled: true
-           type: bridge
-@@ -166,4 +172,4 @@ parameters:
-           address: ${_param:single_address}
-           netmask: 255.255.255.0
-           use_interfaces:
--            - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
-+            - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
-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 1540133..d370496 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
-@@ -30,7 +30,6 @@ parameters:
-     cluster_node03_address: ${_param:openstack_control_node03_address}
-     nova_vncproxy_url: https://${_param:cluster_public_host}:6080
-     mgmt_nic: ${_param:opnfv_baremetal_primary_nic}
--    external_nic: ${_param:opnfv_baremetal_tertiary_nic}
-     interface_mtu: 1500
-     keepalived_vip_interface: br-ctl
-     keepalived_vip_virtual_router_id: 69
-@@ -58,19 +57,13 @@ parameters:
-           type: eth
-           proto: dhcp
-           name: ${_param:mgmt_nic}
--        external_nic:
--          enabled: true
--          name: ${_param:external_nic}
--          mtu: ${_param:interface_mtu}
--          proto: manual
--          type: eth
-         mgmt-vlan:
-           enabled: true
-           proto: manual
-           type: vlan
--          name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
-+          name: ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan}
-           use_interfaces:
--            - ${_param:mgmt_nic}
-+            - ${_param:tenant_nic}
-         br-ctl:
-           enabled: true
-           type: bridge
-@@ -78,7 +71,7 @@ parameters:
-           address: ${_param:single_address}
-           netmask: 255.255.255.0
-           use_interfaces:
--            - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
-+            - ${_param:tenant_nic}.${_param:opnfv_net_mgmt_vlan}
-         br-floating:
-           enabled: true
-           type: ovs_bridge
-@@ -95,6 +88,6 @@ parameters:
-           address: ${_param:external_address}
-           netmask: 255.255.255.0
-           use_interfaces:
--            - ${_param:external_nic}
-+            - ${_param:tenant_nic}
-           use_ovs_ports:
-             - float-to-ex
diff --git a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch
index 3c5a6ea9..0101573e 100644
--- a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
+++ b/patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch
@@ -102,11 +102,11 @@ index 0000000..b969e07
 ++{{endif}}
 ++{% endraw %}
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 744304d..9bdbff5 100644
+index accdb6b..88b3ffe 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -14,3 +14,4 @@
- /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch
+@@ -15,3 +15,4 @@
  /usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch
  /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
+ /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch
 +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
diff --git a/patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch b/patches/opnfv-fuel/0005-maas-boot-resources-Add-arm64-architecture.patch
index 91e13434..91e13434 100644
--- a/patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch
+++ b/patches/opnfv-fuel/0005-maas-boot-resources-Add-arm64-architecture.patch
diff --git a/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch b/patches/opnfv-fuel/0006-libvirt-Use-libvirt-unix_sock_group.patch
index f98185d3..6179b911 100644
--- a/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch
+++ b/patches/opnfv-fuel/0006-libvirt-Use-libvirt-unix_sock_group.patch
@@ -48,11 +48,11 @@ index 0000000..003b249
 + # Set the UNIX socket permissions for the R/O socket. This is used
 + # for monitoring VM status only
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 9bdbff5..093bf05 100644
+index 88b3ffe..e355700 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -15,3 +15,4 @@
- /usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch
+@@ -16,3 +16,4 @@
  /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
+ /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch
  /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
 +/usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch
diff --git a/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index 7c188244..7c188244 100644
--- a/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
diff --git a/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
index 4362dd6c..aa0b9f97 100644
--- a/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -150,20 +150,20 @@ index 0000000..a9fe11b
 +
 + #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 093bf05..7032a6d 100644
+index e355700..b2745a1 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -16,3 +16,5 @@
- /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
+@@ -17,3 +17,5 @@
+ /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch
  /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
  /usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.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/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
-index b270e0f..4bf8dec 100644
+index 757295a..fe17fa6 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
-@@ -40,21 +40,33 @@ parameters:
+@@ -42,21 +42,33 @@ parameters:
          openstack.control:
            cpu: 4
            ram: 12288
@@ -197,7 +197,7 @@ index b270e0f..4bf8dec 100644
            disk_profile: xxlarge
            net_profile: default
          # stacklight.log:
-@@ -75,6 +87,9 @@ parameters:
+@@ -77,6 +89,9 @@ parameters:
          openstack.proxy:
            cpu: 2
            ram: 2048
@@ -208,7 +208,7 @@ index b270e0f..4bf8dec 100644
            net_profile: default
        cluster:
 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
-index 344b190..3ac09f2 100644
+index d7bbadd..f8b9662 100644
 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
 @@ -17,6 +17,9 @@ parameters:
diff --git a/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch b/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch
index a9e65337..a9e65337 100644
--- a/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch
+++ b/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch
diff --git a/patches/opnfv-fuel/0011-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch
index a0356850..12a76e9f 100644
--- a/patches/opnfv-fuel/0011-seedng-module-Add-AArch64-repo.patch
+++ b/patches/opnfv-fuel/0010-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 7032a6d..875040f 100644
+index b2745a1..9c28735 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -18,3 +18,4 @@
+@@ -19,3 +19,4 @@
  /usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.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/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch b/patches/opnfv-fuel/0011-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
index faa0444c..faa0444c 100644
--- a/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
+++ b/patches/opnfv-fuel/0011-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
diff --git a/patches/opnfv-fuel/0013-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0012-aarch64-skip-configuration-of-hugepages.patch
index af9c1175..684f45cb 100644
--- a/patches/opnfv-fuel/0013-aarch64-skip-configuration-of-hugepages.patch
+++ b/patches/opnfv-fuel/0012-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 d370496..bddb1ee 100644
+index 7d3dcb0..3685836 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/0014-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0013-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
index 15c1c19f..15c1c19f 100644
--- a/patches/opnfv-fuel/0014-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
+++ b/patches/opnfv-fuel/0013-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
diff --git a/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0014-Add-opnfv-user-to-the-deployment.patch
index 52d2b4d9..52d2b4d9 100644
--- a/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0014-Add-opnfv-user-to-the-deployment.patch