Merge "Do not assume vol.encryption is enabled when barbican is on"
This commit is contained in:
commit
ae4a67c759
@ -58,10 +58,6 @@ class ComputeService(VersionedService):
|
||||
C.LOG.info('Can not retrieve hosts, user are not allowed')
|
||||
return 1
|
||||
|
||||
def post_configuration(self, conf, is_service):
|
||||
conf.set('compute-feature-enabled', 'attach_encrypted_volume',
|
||||
str(is_service(**{'type': 'key-manager'})))
|
||||
|
||||
@staticmethod
|
||||
def get_service_type():
|
||||
return ['compute']
|
||||
|
Loading…
x
Reference in New Issue
Block a user