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-10 17:37:27 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-10 19:25:50 +0000
commite20d301155b817855fb10332f6431681c34626ce (patch)
tree5bc861f4505a23fa98a6da3ed246aa0d7bea0f71 /patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch
parentabfef7b5acc25201d263e68e61ef01c375818bc9 (diff)
u/fuel: Bump & rebase for proxy apache fix
Change-Id: Id4b6c37d6814458600e2554f96e4580b126f1b63 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 04f9a353dc4a52eb869f0eaac3aafec1723c0a3d)
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.patch10
1 files changed, 5 insertions, 5 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 3418177d..d7d8be17 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 ec1cd00..7746bac 100755
+index e8b4271..585a808 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -18,6 +18,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'
+@@ -25,6 +25,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
+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
-@@ -48,6 +49,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
+@@ -55,6 +56,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; };