summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-18 22:17:00 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-18 22:18:50 +0100
commit939bdcd9a425674eaca2d9556da4f34f11b0e23f (patch)
treec8010b6d518714bff0cb864b8a8d3b8cfa546d89 /patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch
parent9b3121843a78026761a086581fc34589faed25af (diff)
u/fuel: Bump & rebase for netconfig rm via salt
Change-Id: I0de153ef4e5a71f350d29a90ae4c79b863d676eb Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch')
-rw-r--r--patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch6
1 files changed, 3 insertions, 3 deletions
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 d7d8be17..8e27230b 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,10 +21,10 @@ 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 e8b4271..585a808 100755
+index 8b9e3ef..34fe956 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -25,6 +25,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
+@@ -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
@@ -32,7 +32,7 @@ index e8b4271..585a808 100755
salt -C 'kvm*' state.apply linux.network
salt -C 'cmp*' state.apply linux.system
salt -C 'cmp*' state.apply linux.network || true
-@@ -55,6 +56,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
+@@ -53,6 +54,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; };