openstack/charm-keystone
Code Issues Proposed changes

Change default mkdir permissions to 755 for deploy from source

Browse Source
This commit is contained in:
Corey Bryant 2015-04-17 12:10:54 +00:00
parent 419368c05c
commit f3643788cf
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/keystone_utils.py
View File

@ -1688,7 +1688,7 @@ def git_pre_install():
add_user_to_group('keystone', 'keystone') add_user_to_group('keystone', 'keystone')
for d in dirs: for d in dirs:
mkdir(d, owner='keystone', group='keystone', perms=0700, force=False) mkdir(d, owner='keystone', group='keystone', perms=0755, force=False)
for l in logs: for l in logs:
write_file(l, '', owner='keystone', group='keystone', perms=0600) write_file(l, '', owner='keystone', group='keystone', perms=0600)

7
unit_tests/test_keystone_hooks.py
View File

@ -118,9 +118,10 @@ class KeystoneRelationTests(CharmTestCase):
self.assertTrue(self.apt_update.called) self.assertTrue(self.apt_update.called)
self.apt_install.assert_called_with( self.apt_install.assert_called_with(
['haproxy', 'unison', 'python-setuptools', 'python-six', 'uuid', ['haproxy', 'unison', 'python-setuptools', 'python-six', 'uuid',
'python-mysqldb', 'python-pip', 'openssl', 'apache2', 'pwgen', 'python-mysqldb', 'python-pip', 'libssl-dev', 'openssl',
'libxslt1-dev', 'python-psycopg2', 'zlib1g-dev', 'python-dev', 'libffi-dev', 'apache2', 'pwgen', 'libxslt1-dev',
'libxml2-dev'], fatal=True) 'python-psycopg2', 'zlib1g-dev', 'python-dev', 'libxml2-dev'],
fatal=True)
self.git_install.assert_called_with(projects_yaml) self.git_install.assert_called_with(projects_yaml)
mod_ch_openstack_utils = 'charmhelpers.contrib.openstack.utils' mod_ch_openstack_utils = 'charmhelpers.contrib.openstack.utils'

6
unit_tests/test_keystone_utils.py
View File

@ -642,11 +642,11 @@ class TestKeystoneUtils(CharmTestCase):
add_user_to_group.assert_called_with('keystone', 'keystone') add_user_to_group.assert_called_with('keystone', 'keystone')
expected = [ expected = [
call('/var/lib/keystone', owner='keystone', call('/var/lib/keystone', owner='keystone',
group='keystone', perms=0700, force=False), group='keystone', perms=0755, force=False),
call('/var/lib/keystone/cache', owner='keystone', call('/var/lib/keystone/cache', owner='keystone',
group='keystone', perms=0700, force=False), group='keystone', perms=0755, force=False),
call('/var/log/keystone', owner='keystone', call('/var/log/keystone', owner='keystone',
group='keystone', perms=0700, force=False), group='keystone', perms=0755, force=False),
] ]
self.assertEquals(mkdir.call_args_list, expected) self.assertEquals(mkdir.call_args_list, expected)
write_file.assert_called_with('/var/log/keystone/keystone.log', write_file.assert_called_with('/var/log/keystone/keystone.log',