u/fuel: Bump & rebase for ODL scenario rename

JIRA: FUEL-279

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

5 files changed, 52 insertions, 56 deletions

diff --git a/patches/opnfv-fuel/0002-classes-virtual-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0002-classes-virtual-AArch64-virtio-NIC-names-sync.patch
index 99c6e715..e3cb48fa 100644
--- a/patches/opnfv-fuel/0002-classes-virtual-AArch64-virtio-NIC-names-sync.patch
+++ b/patches/opnfv-fuel/0002-classes-virtual-AArch64-virtio-NIC-names-sync.patch
@@ -33,11 +33,9 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  .../cluster/virtual-mcp-ocata-common/openstack_gateway.yml        | 8 ++++----
  .../classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml | 2 +-
  .../cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml | 2 +-
- .../classes/cluster/virtual-mcp-ocata-odl/infra/config.yml        | 2 +-
- .../cluster/virtual-mcp-ocata-odl/opendaylight/control.yml        | 2 +-
  .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml   | 6 +++---
  .../classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml        | 2 +-
- 9 files changed, 18 insertions(+), 18 deletions(-)
+ 7 files changed, 16 insertions(+), 16 deletions(-)
 
 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 0cb7ccb..808fbab 100644
@@ -137,32 +135,6 @@ index 6bc0f51..4dacc73 100644
            enabled: true
            type: eth
            proto: static
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
-index 328d6df..57c6cec 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
-@@ -27,7 +27,7 @@ parameters:
-   linux:
-     network:
-       interface:
--        ens4:
-+        enp2s0:
-           enabled: true
-           type: eth
-           proto: static
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
-index 38431a5..066488b 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
-@@ -10,7 +10,7 @@ parameters:
-   linux:
-     network:
-       interface:
--        ens4:
-+        enp2s0:
-           enabled: true
-           type: eth
-           proto: static
 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
 index 864c71d..aec6cde 100644
 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
diff --git a/patches/opnfv-fuel/0004-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0004-network-public-Use-arm-virtual2-POD-config.patch
index 7904c25a..0097a574 100644
--- a/patches/opnfv-fuel/0004-network-public-Use-arm-virtual2-POD-config.patch
+++ b/patches/opnfv-fuel/0004-network-public-Use-arm-virtual2-POD-config.patch
@@ -37,11 +37,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  mcp/config/states/networks                                          | 6 +++---
  .../classes/cluster/virtual-mcp-ocata-common/openstack_init.yml     | 2 +-
  .../classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml   | 6 +++---
- mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml  | 6 +++---
  .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml     | 6 +++---
  mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml  | 6 +++---
  mcp/scripts/net_public.xml                                          | 2 +-
- 7 files changed, 17 insertions(+), 17 deletions(-)
+ 6 files changed, 14 insertions(+), 14 deletions(-)
 
 diff --git a/mcp/config/states/networks b/mcp/config/states/networks
 index 505153a..bd6e923 100755
@@ -102,30 +101,6 @@ index 2f8e94a..bc95642 100644
          opendaylight_control_node01:
            classes:
            - cluster.${_param:cluster_name}.opendaylight.control
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
-index 57c6cec..f519e22 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
-@@ -51,16 +51,16 @@ parameters:
-           params:
-             single_address: 172.16.10.105
-             tenant_address: 10.1.0.105
--            external_address: 10.16.0.105
-+            external_address: 10.0.9.105
-         openstack_compute_node02:
-           params:
-             single_address: 172.16.10.106
-             tenant_address: 10.1.0.106
--            external_address: 10.16.0.106
-+            external_address: 10.0.9.106
-         openstack_gateway_node01:
-           params:
-             tenant_address: 10.1.0.110
--            external_address: 10.16.0.110
-+            external_address: 10.0.9.110
-         opendaylight_control_node01:
-           classes:
-           - cluster.${_param:cluster_name}.opendaylight.control
 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
 index aec6cde..b69258f 100644
 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
diff --git a/patches/opnfv-fuel/0009-network-public-mgmt-Use-arm-pod3-POD-config.patch b/patches/opnfv-fuel/0009-network-public-mgmt-Use-arm-pod3-POD-config.patch
index de107523..ca13186a 100644
--- a/patches/opnfv-fuel/0009-network-public-mgmt-Use-arm-pod3-POD-config.patch
+++ b/patches/opnfv-fuel/0009-network-public-mgmt-Use-arm-pod3-POD-config.patch
@@ -24,7 +24,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  7 files changed, 86 insertions(+), 86 deletions(-)
 
 diff --git a/ci/deploy.sh b/ci/deploy.sh
-index 72dedfc..0f08f1c 100755
+index f73fdfc..21b8bab 100755
 --- a/ci/deploy.sh
 +++ b/ci/deploy.sh
 @@ -143,7 +143,7 @@ URI_REGEXP='(file|https?|ftp)://.*'
diff --git a/patches/opnfv-fuel/0021-lib.sh-Remove-all-storage-on-undefine.patch b/patches/opnfv-fuel/0021-lib.sh-Remove-all-storage-on-undefine.patch
new file mode 100644
index 00000000..e29daa1e
--- /dev/null
+++ b/patches/opnfv-fuel/0021-lib.sh-Remove-all-storage-on-undefine.patch
@@ -0,0 +1,49 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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: Thu, 7 Sep 2017 21:55:16 +0200
+Subject: [PATCH] lib.sh: Remove all storage on undefine
+
+While executing the deploy script via sudo will raise no issues with
+re-using old storage volume files, non-root deploys fail to change
+ownership of said files.
+
+Properly clean after ourselves when destroying and undefining VMs.
+
+JIRA: ARMBAND-311
+
+Change-Id: I7fdd269dccbfd5ab5285d852ac7dacfc4dc5ccd7
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ mcp/scripts/lib.sh | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
+index 884e852..f43bb08 100644
+--- a/mcp/scripts/lib.sh
++++ b/mcp/scripts/lib.sh
+@@ -43,7 +43,9 @@ cleanup_vms() {
+     virsh destroy "${node}"
+   done
+   for node in $(virsh list --name --all | grep -P '\w{3}\d{2}'); do
+-    virsh undefine --nvram "${node}"
++    virsh domblklist "${node}" | awk '/^.da/ {print $2}' | \
++      xargs --no-run-if-empty -I{} sudo rm -f {}
++    virsh undefine "${node}" --remove-all-storage --nvram
+   done
+ }
+
+@@ -55,6 +57,7 @@ prepare_vms() {
+   cleanup_uefi
+   cleanup_vms
+   get_base_image "${base_image}" "${image_dir}"
++  # shellcheck disable=SC2016
+   envsubst '${SALT_MASTER},${CLUSTER_DOMAIN}' < \
+     user-data.template > user-data.sh
+
diff --git a/upstream/fuel b/upstream/fuel
-Subproject cde147cf3aec7f79b0a4d2bd60d01c355e5861e
+Subproject ac7bb381c5376c28b0eeac880af90b50a2801f3