From 6e71b19097781a7190bcec015afc62be7961fa43 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 13 Oct 2017 23:28:38 +0200 Subject: u/fuel: Bump & rebase for VCP state split Change-Id: I6f0367d75ea831de78ced480ea73d1cd10680b80 (cherry picked from commit 11143873e70e65d07d73617b8af29a07adffc1aa) --- .../0015-Add-opnfv-user-to-the-deployment.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch') diff --git a/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch index ebc43d7e..0b6598b8 100644 --- a/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch @@ -14,25 +14,25 @@ Signed-off-by: Alexandru Avadanii Signed-off-by: Charalampos Kominos Signed-off-by: Guillermo Herrero --- - mcp/config/states/maas | 2 ++ + mcp/config/states/virtual_control_plane | 2 ++ mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml | 4 ++++ mcp/salt-formulas/opnfv/adduser.sls | 7 +++++++ 3 files changed, 13 insertions(+) create mode 100644 mcp/salt-formulas/opnfv/adduser.sls -diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 68390c0..036f76a 100755 ---- a/mcp/config/states/maas -+++ b/mcp/config/states/maas -@@ -84,6 +84,7 @@ salt -C 'mas01*' pillar.item\ - salt -C '* and not cfg01* and not mas01*' saltutil.sync_all +diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane +index 59424ac..12fff84 100755 +--- a/mcp/config/states/virtual_control_plane ++++ b/mcp/config/states/virtual_control_plane +@@ -6,6 +6,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" + # KVM, compute node prereqs (libvirt first), VCP deployment salt -C 'kvm*' pkg.install bridge-utils +salt -C '*' state.apply opnfv.adduser salt -C 'kvm*' state.apply linux.network salt -C 'kvm*' state.apply armband.bootstrap_script_arm64 salt -C 'kvm*' system.reboot -@@ -108,6 +109,7 @@ while [ $rc -ne 0 ]; do +@@ -30,6 +31,7 @@ while [ $rc -ne 0 ]; do rc=0 for node in $vcp_nodes; do salt "$node" test.ping 2>/dev/null || { rc=$?; break; }; -- cgit 1.2.3-korg