openstack
/
manila
Code Issues Proposed changes

Fix devstack smb configuration outside ubuntu 

Some distros ship with /etc/samba/smb.conf already in
place, without /usr/share/samba/smb.conf.

Only copy /etc/samba/smb.conf from /usr/share/samba/smb.conf
if /usr/share/samba/smb.conf exists.

Change-Id: I22aeed317a94774ff03c1aadf6a65f5edb490837
Fixes-bug: 1645860
(cherry picked from commit 6a211b7cf5)
This commit is contained in:
Tom Barron 2016-11-29 16:32:08 -05:00
parent ccdcc669f0
commit bf5f66671a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/plugin.sh
View File

@ -715,7 +715,9 @@ function configure_samba {
sudo service $samba_daemon_name restart || echo "Couldn't restart '$samba_daemon_name' service"
fi
sudo cp /usr/share/samba/smb.conf $SMB_CONF
if [[ -e /usr/share/samba/smb.conf ]]; then
sudo cp /usr/share/samba/smb.conf $SMB_CONF
fi
sudo chown $STACK_USER -R /etc/samba
iniset $SMB_CONF global include registry
iniset $SMB_CONF global security user