u/fuel: Bump & rebase for ODL Oxygen

Drop obsolete patches:
- UCA arch list extension (upstream no longer enforces the arch);

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

1 files changed, 0 insertions, 72 deletions

diff --git a/patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch
deleted file mode 100644
index 083cf37d..00000000
--- a/patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 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: Charalampos Kominos <Charalampos.Kominos@enea.com>
-Date: Fri, 1 Sep 2017 12:24:35 +0200
-Subject: [PATCH] Add opnfv user to the deployment
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
-Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
----
- mcp/config/states/baremetal_init                         | 1 +
- mcp/config/states/virtual_control_plane                  | 1 +
- mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml | 4 ++++
- mcp/salt-formulas/opnfv/adduser.sls                      | 7 +++++++
- 4 files changed, 13 insertions(+)
- create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
-
-diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
-index 0c41557d..799a9419 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 \
-   repl="\n        if not __salt__['pkg.version']('vlan'):\n            __salt__['pkg.install']('vlan')"
-
- salt -C 'kvm*' pkg.install bridge-utils
-+salt -C 'kvm* or cmp*' state.apply opnfv.adduser
- salt -C 'kvm*' state.apply linux.network,linux.system.kernel
- salt -C 'kvm* or cmp*' state.apply 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 02a813c9..a179b22c 100755
---- a/mcp/config/states/virtual_control_plane
-+++ b/mcp/config/states/virtual_control_plane
-@@ -39,6 +39,7 @@ vcp_nodes=$(salt --out yaml 'kvm01*' pillar.get salt:control:cluster:internal:no
- # Check all vcp nodes are available
- wait_for 25.0 "(for n in ${vcp_nodes}; do salt \${n} test.ping 2>/dev/null || exit; done)"
-
-+wait_for 5.0 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply opnfv.adduser"
- wait_for 10.0 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"
-
- # Propagate APT proxy config created by curtin on baremetal nodes to VCP VMs
-diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml
-index f9aeb71a..21a5de4e 100644
---- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml
-+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml
-@@ -9,3 +9,7 @@
- classes:
-   - cluster.all-mcp-arch-common.arch
-   - cluster.all-mcp-arch-common.opnfv
-+parameters:
-+  _param:
-+    opnfv_user_username: opnfv
-+    opnfv_user_password: $1$5/pIEHT1$XFBhNWW4Q8gYd19hczgPF1
-diff --git a/mcp/salt-formulas/opnfv/adduser.sls b/mcp/salt-formulas/opnfv/adduser.sls
-new file mode 100644
-index 00000000..78ef993d
---- /dev/null
-+++ b/mcp/salt-formulas/opnfv/adduser.sls
-@@ -0,0 +1,7 @@
-+add_opnfv_user:
-+  user.present:
-+  - name: {{ salt['pillar.get']('_param:opnfv_user_username') }}
-+  - password: {{ salt['pillar.get']('_param:opnfv_user_password') }}
-+  - createhome: True
-+  - groups:
-+    - sudo