From 6fcc669084d3a26136454a4d932f68cc900a71c0 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 11 Jun 2018 17:52:43 +0200 Subject: u/fuel: Bump & rebase for keyserver proxy rebase Change-Id: I9ecf7ae9b07f8000e75b13324ebcf8e97981fa22 Signed-off-by: Alexandru Avadanii --- patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch') diff --git a/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch index a5196f38..a5b2d909 100644 --- a/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch @@ -22,13 +22,13 @@ Signed-off-by: Guillermo Herrero create mode 100644 mcp/salt-formulas/opnfv/adduser.sls diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init -index 54ffb873..07dcef27 100755 +index 2de3b9f3..1dde8527 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init @@ -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 + salt -C 'kvm* or cmp*' pkg.install bridge-utils +salt -C 'kvm* or cmp*' state.apply opnfv.adduser salt -C 'kvm*' state.apply linux.network,linux.system.kernel salt -C 'kvm* or cmp*' state.apply salt.minion -- cgit 1.2.3-korg