summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-18 16:24:37 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-18 16:24:37 +0000
commit8749d6cade0b3892ea57583ee54b3bf72bdd91f8 (patch)
tree002fb62791e4b048670fcf96f073c142abe60158 /patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch
parent41fd911de4f0c302f44c9a3af12aebc852dfffc8 (diff)
parente68b725920bd313df0ca65a77b27c8de6a6e2937 (diff)
Merge "u/fuel: Bump & rebase for state break & retry"
Diffstat (limited to 'patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch')
-rw-r--r--patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch10
1 files changed, 5 insertions, 5 deletions
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 bfcaba12..52d2b4d9 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
@@ -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 899972c..1ea14b1 100755
+index 75386a7..083dd32 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -12,6 +12,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
+@@ -14,6 +14,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
-@@ -36,6 +37,7 @@ while [ $rc -ne 0 ]; do
+ salt -C 'cmp*' state.apply linux.system
+ salt -C 'kvm*' state.apply armband.bootstrap_script_arm64 || true
+@@ -41,6 +42,7 @@ while [ $rc -ne 0 ]; do
rc=0
for node in $vcp_nodes; do
salt "$node" test.ping 2>/dev/null || { rc=$?; break; };