X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fosm-lcm%2Fsrc%2Fcharm.py;h=c7e1126f96221a4b0bde0bdbecec9489dbb149b0;hb=7cb878a01863db170ee1d6c238d13708295b9748;hp=8c8c6e1434bdb59cb32b203e16044765189ad5b7;hpb=30d8e41085621fbdf305c072565c7a56175605c3;p=osm%2Fdevops.git diff --git a/installers/charm/osm-lcm/src/charm.py b/installers/charm/osm-lcm/src/charm.py index 8c8c6e14..c7e1126f 100755 --- a/installers/charm/osm-lcm/src/charm.py +++ b/installers/charm/osm-lcm/src/charm.py @@ -38,6 +38,7 @@ from charms.osm_libs.v0.utils import ( check_container_ready, check_service_active, ) +from charms.osm_temporal.v0.temporal import TemporalRequires from charms.osm_ro.v0.ro import RoRequires from charms.osm_vca_integrator.v0.vca import VcaDataChangedEvent, VcaRequires from ops.charm import ActionEvent, CharmBase, CharmEvents @@ -84,6 +85,7 @@ class OsmLcmCharm(CharmBase): super().__init__(*args) self.vca = VcaRequires(self) self.kafka = KafkaRequires(self) + self.temporal = TemporalRequires(self) self.mongodb_client = MongoClient(self, "mongodb") self._observe_charm_events() self.ro = RoRequires(self) @@ -102,7 +104,8 @@ class OsmLcmCharm(CharmBase): # Check if the container is ready. # Eventually it will become ready after the first pebble-ready event. check_container_ready(self.container) - self._configure_service(self.container) + if not self.debug_mode.started: + self._configure_service(self.container) # Update charm status self._on_update_status() @@ -179,6 +182,8 @@ class OsmLcmCharm(CharmBase): self.on["mongodb"].relation_broken: self._on_required_relation_broken, self.on["ro"].relation_changed: self._on_config_changed, self.on["ro"].relation_broken: self._on_required_relation_broken, + self.on["temporal"].relation_changed: self._on_config_changed, + self.on["temporal"].relation_broken: self._on_required_relation_broken, self.on.vca_data_changed: self._on_config_changed, self.on["vca"].relation_broken: self._on_config_changed, # Action events @@ -202,6 +207,8 @@ class OsmLcmCharm(CharmBase): missing_relations.append("mongodb") if not self.ro.host or not self.ro.port: missing_relations.append("ro") + if not self.temporal.host or not self.temporal.port: + missing_relations.append("temporal") if missing_relations: relations_str = ", ".join(missing_relations) @@ -240,6 +247,9 @@ class OsmLcmCharm(CharmBase): "OSMLCM_STORAGE_URI": self.mongodb_client.connection_string, "OSMLCM_VCA_HELM_CA_CERTS": self.config["helm-ca-certs"], "OSMLCM_VCA_STABLEREPOURL": self.config["helm-stable-repo-url"], + # Temporal configuration + "OSMNBI_TEMPORAL_HOST": self.temporal.host, + "OSMNBI_TEMPORAL_PORT": self.temporal.port, } # Vca configuration if self.vca.data: