[cinder-k8s] Use ServicePebbleHandler for cinder-scheduler
Use default functions provided by ServicePebbleHandler for cinder-scheduler container service. Fixes: #2100839 Change-Id: I8f46ed65b1deecbf344533052dea7325a4dd7c3e
This commit is contained in:
@@ -102,24 +102,9 @@ class CinderWSGIPebbleHandler(sunbeam_chandlers.WSGIPebbleHandler):
|
|||||||
|
|
||||||
|
|
||||||
@sunbeam_tracing.trace_type
|
@sunbeam_tracing.trace_type
|
||||||
class CinderSchedulerPebbleHandler(sunbeam_chandlers.PebbleHandler):
|
class CinderSchedulerPebbleHandler(sunbeam_chandlers.ServicePebbleHandler):
|
||||||
"""Pebble handler for Cinder Scheduler services."""
|
"""Pebble handler for Cinder Scheduler services."""
|
||||||
|
|
||||||
def start_service(self):
|
|
||||||
"""Start services in container."""
|
|
||||||
container = self.charm.unit.get_container(self.container_name)
|
|
||||||
if not container:
|
|
||||||
logger.debug(
|
|
||||||
f"{self.container_name} container is not ready. "
|
|
||||||
"Cannot start service."
|
|
||||||
)
|
|
||||||
return
|
|
||||||
service = container.get_service(self.service_name)
|
|
||||||
if service.is_running():
|
|
||||||
container.stop(self.service_name)
|
|
||||||
|
|
||||||
container.start(self.service_name)
|
|
||||||
|
|
||||||
def get_layer(self) -> dict:
|
def get_layer(self) -> dict:
|
||||||
"""Cinder Scheduler service.
|
"""Cinder Scheduler service.
|
||||||
|
|
||||||
@@ -140,11 +125,6 @@ class CinderSchedulerPebbleHandler(sunbeam_chandlers.PebbleHandler):
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
def init_service(self, context) -> None:
|
|
||||||
"""Initialize services and write configuration."""
|
|
||||||
self.write_config(context)
|
|
||||||
self.start_service()
|
|
||||||
|
|
||||||
def default_container_configs(self) -> List[Dict]:
|
def default_container_configs(self) -> List[Dict]:
|
||||||
"""Generate default configuration files for container."""
|
"""Generate default configuration files for container."""
|
||||||
return [
|
return [
|
||||||
|
Reference in New Issue
Block a user