projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support of Ubuntu22 docker image for NG-UI
[osm/devops.git]
/
installers
/
charm
/
osm-ng-ui
/
src
/
charm.py
diff --git
a/installers/charm/osm-ng-ui/src/charm.py
b/installers/charm/osm-ng-ui/src/charm.py
index
f74fe0b
..
ca517b3
100755
(executable)
--- 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.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
SERVICE_PORT = 80
@@
-113,8
+113,8
@@
class OsmNgUiCharm(CharmBase):
logger.debug(e.message)
self.unit.status = e.status
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)
# Check Pebble has started in the container
try:
check_container_ready(self.container)
@@
-124,7
+124,7
@@
class OsmNgUiCharm(CharmBase):
except CharmError:
pass
finally:
except CharmError:
pass
finally:
- self.
_on_update_status(
)
+ self.
unit.status = BlockedStatus("need nbi relation"
)
# ---------------------------------------------------------------------------
# Validation and configuration and more
# ---------------------------------------------------------------------------
# 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.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)
}
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",
)
default_site_config = re.sub(
"proxy_pass .*\n",
- f"proxy_pass http
s
://{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)
default_site_config,
)
container.push("/etc/nginx/sites-available/default", default_site_config)