X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fosm-ng-ui%2Fsrc%2Fcharm.py;h=ca517b3141a986216b7a545aa8673db2df847c06;hb=b17abf76811b74f98bd5852d6ce4010a4acb680a;hp=f74fe0b29016e38fd4e7cbb0550b58a70709d7b0;hpb=06cacb28e8256c0d7c287516f7aaddb6e3fb6d21;p=osm%2Fdevops.git diff --git a/installers/charm/osm-ng-ui/src/charm.py b/installers/charm/osm-ng-ui/src/charm.py index f74fe0b2..ca517b31 100755 --- a/installers/charm/osm-ng-ui/src/charm.py +++ b/installers/charm/osm-ng-ui/src/charm.py @@ -43,7 +43,7 @@ from lightkube.models.core_v1 import ServicePort from ops.charm import CharmBase from ops.framework import StoredState from ops.main import main -from ops.model import ActiveStatus, Container +from ops.model import ActiveStatus, BlockedStatus, Container SERVICE_PORT = 80 @@ -113,8 +113,8 @@ class OsmNgUiCharm(CharmBase): logger.debug(e.message) self.unit.status = e.status - def _on_required_relation_broken(self, _) -> None: - """Handler for the kafka-broken event.""" + def _on_nbi_relation_broken(self, _) -> None: + """Handler for the nbi relation broken event.""" # Check Pebble has started in the container try: check_container_ready(self.container) @@ -124,7 +124,7 @@ class OsmNgUiCharm(CharmBase): except CharmError: pass finally: - self._on_update_status() + self.unit.status = BlockedStatus("need nbi relation") # --------------------------------------------------------------------------- # Validation and configuration and more @@ -142,7 +142,7 @@ class OsmNgUiCharm(CharmBase): self.on.update_status: self._on_update_status, # Relation events self.on["nbi"].relation_changed: self._on_config_changed, - self.on["nbi"].relation_broken: self._on_required_relation_broken, + self.on["nbi"].relation_broken: self._on_nbi_relation_broken, } for event, handler in event_handler_mapping.items(): self.framework.observe(event, handler) @@ -214,7 +214,7 @@ class OsmNgUiCharm(CharmBase): ) default_site_config = re.sub( "proxy_pass .*\n", - f"proxy_pass https://{self.nbi.host}:{self.nbi.port};\n", + f"proxy_pass http://{self.nbi.host}:{self.nbi.port};\n", default_site_config, ) container.push("/etc/nginx/sites-available/default", default_site_config)