remove service_enabled
This commit is contained in:
parent
51a51d305f
commit
784955ddd8
|
@ -73,7 +73,7 @@ class ApacheSSLContext(SSLContext):
|
|||
service_namespace = 'glance'
|
||||
|
||||
def __call__(self):
|
||||
from glance_utils import service_enabled
|
||||
if not service_enabled('glance-api'):
|
||||
return {}
|
||||
#from glance_utils import service_enabled
|
||||
#if not service_enabled('glance-api'):
|
||||
# return {}
|
||||
return super(ApacheSSLContext, self).__call__()
|
||||
|
|
|
@ -141,15 +141,3 @@ def set_ceph_env_variables(service):
|
|||
out.write('CEPH_ARGS="--id %s"\n' % service)
|
||||
with open('/etc/init/glance.override', 'w') as out:
|
||||
out.write('env CEPH_ARGS="--id %s"\n' % service)
|
||||
|
||||
|
||||
def service_enabled(service):
|
||||
'''
|
||||
Determine if a specific cinder service is enabled in charm configuration.
|
||||
|
||||
:returns: boolean: True if service is enabled in config, False if not.
|
||||
'''
|
||||
enabled = config()['enabled-services']
|
||||
if enabled == 'all':
|
||||
return True
|
||||
return service in enabled
|
||||
|
|
Loading…
Reference in New Issue