openstack/charm-ceph-radosgw
Code Issues Proposed changes

Merge "Check if /var/lib/ceph/nss exists before creation"

Browse Source
This commit is contained in:
Jenkins 2016-03-30 08:59:29 +00:00 committed by Gerrit Code Review
commit f4b9a78139
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hooks/hooks.py
View File

@ -131,7 +131,8 @@ def install():
execd_preinstall() execd_preinstall()
enable_pocket('multiverse') enable_pocket('multiverse')
install_packages() install_packages()
os.makedirs(NSS_DIR) if not os.path.exists(NSS_DIR):
os.makedirs(NSS_DIR)
if not os.path.exists('/etc/ceph'): if not os.path.exists('/etc/ceph'):
os.makedirs('/etc/ceph') os.makedirs('/etc/ceph')
@ -158,7 +159,8 @@ def setup_keystone_certs(unit=None, rid=None):
from keystoneclient.v2_0 import client from keystoneclient.v2_0 import client
certs_path = '/var/lib/ceph/nss' certs_path = '/var/lib/ceph/nss'
mkdir(certs_path) if not os.path.exists(certs_path):
mkdir(certs_path)
rdata = relation_get(unit=unit, rid=rid) rdata = relation_get(unit=unit, rid=rid)
auth_protocol = rdata.get('auth_protocol', 'http') auth_protocol = rdata.get('auth_protocol', 'http')