summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch6
-rw-r--r--patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch4
-rw-r--r--patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch4
-rw-r--r--patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch10
-rw-r--r--patches/opnfv-fuel/0014-Add-opnfv-user-to-libvirt-group.patch26
m---------upstream/fuel0
6 files changed, 12 insertions, 38 deletions
diff --git a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
index e6e09bfc..14a2c9af 100644
--- a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
@@ -58,7 +58,7 @@ index 19cd417..73983d2 100755
+
+salt -I 'nova:compute' state.sls armband || true
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index 9237cc0..17421a9 100755
+index e816a9d..f688f5c 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -52,6 +52,7 @@ salt -I 'neutron:server' state.sls neutron -b 1
@@ -70,10 +70,10 @@ index 9237cc0..17421a9 100755
salt -I 'mongodb:server' state.sls mongodb || true
wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'"
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 0650869..7611c12 100755
+index 9ebf4bf..044e645 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -23,6 +23,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
+@@ -26,6 +26,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
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 d5a218a5..5b6d6fb6 100644
--- 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
@@ -29,10 +29,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
create mode 100644 mcp/salt-formulas/armband/libvirt_domain_template.sls
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 7611c12..6d63838 100755
+index 044e645..fb1c439 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -24,6 +24,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
+@@ -27,6 +27,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
salt -C 'kvm*' state.sls armband || true
diff --git a/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch b/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch
index 8ba183f4..b3139769 100644
--- a/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch
+++ b/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch
@@ -32,10 +32,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
create mode 100644 mcp/salt-formulas/armband/files/cloud.py.diff
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 6d63838..a5fc061 100755
+index fb1c439..0afd530 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -17,6 +17,7 @@ salt -C 'kvm*' pkg.install bridge-utils
+@@ -20,6 +20,7 @@ salt -C 'kvm*' pkg.install bridge-utils
salt -C 'kvm*' state.apply linux.network
salt -C 'cmp*' state.apply linux.system
salt -C 'cmp*' state.apply linux.network || true
diff --git a/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch
index 75e239a0..d5df3dac 100644
--- a/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch
@@ -21,18 +21,18 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index a5fc061..b2d005b 100755
+index 0afd530..ccf7152 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -14,6 +14,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
-
- # KVM, compute node prereqs (libvirt first), VCP deployment
+@@ -17,6 +17,7 @@ salt -C 'kvm* or cmp*' file.line \
+ /usr/lib/python2.7/dist-packages/salt/modules/debian_ip.py \
+ content='iface = iface.lower()' mode='delete'
salt -C 'kvm*' pkg.install bridge-utils
+salt -C '*' state.apply opnfv.adduser
salt -C 'kvm*' state.apply linux.network
salt -C 'cmp*' state.apply linux.system
salt -C 'cmp*' state.apply linux.network || true
-@@ -44,6 +45,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
+@@ -47,6 +48,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
rc=0
for node in $vcp_nodes; do
salt "$node" test.ping 2>/dev/null || { rc=$?; break; };
diff --git a/patches/opnfv-fuel/0014-Add-opnfv-user-to-libvirt-group.patch b/patches/opnfv-fuel/0014-Add-opnfv-user-to-libvirt-group.patch
deleted file mode 100644
index 1b4bfa02..00000000
--- a/patches/opnfv-fuel/0014-Add-opnfv-user-to-libvirt-group.patch
+++ /dev/null
@@ -1,26 +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: Charalampos Kominos <Charalampos.Kominos@enea.com>
-Date: Fri, 3 Nov 2017 16:49:55 +0100
-Subject: [PATCH] Add opnfv user to libvirt group
-
-Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
----
- mcp/salt-formulas/opnfv/adduser.sls | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mcp/salt-formulas/opnfv/adduser.sls b/mcp/salt-formulas/opnfv/adduser.sls
-index 78ef993..478a204 100644
---- a/mcp/salt-formulas/opnfv/adduser.sls
-+++ b/mcp/salt-formulas/opnfv/adduser.sls
-@@ -5,3 +5,4 @@ add_opnfv_user:
- - createhome: True
- - groups:
- - sudo
-+ - libvirt
diff --git a/upstream/fuel b/upstream/fuel
-Subproject f49340e1aac3f5e8bb009a9d0d35aa6fedba738
+Subproject fa58515facceeffd40883e36da277d56fc5e8d9