X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fmon%2Fsrc%2Fcharm.py;fp=installers%2Fcharm%2Fmon%2Fsrc%2Fcharm.py;h=d0145d4f57c80abd2db552286b5610e4945a27e2;hb=c753dc5f89180d11c1049f6398d74a4f99d7acd5;hp=26dee3ff1824da5f2609afeb57dd13694021b0f4;hpb=ad254a9b68b288f49c91b9f72f483f59188f92a1;p=osm%2Fdevops.git diff --git a/installers/charm/mon/src/charm.py b/installers/charm/mon/src/charm.py index 26dee3ff..d0145d4f 100755 --- a/installers/charm/mon/src/charm.py +++ b/installers/charm/mon/src/charm.py @@ -26,24 +26,15 @@ import logging from typing import NoReturn -from ops.main import main +from ops.main import main from opslib.osm.charm import CharmedOsmBase, RelationsMissing - -from opslib.osm.pod import ( - ContainerV3Builder, - PodSpecV3Builder, -) - -from opslib.osm.validator import ( - ModelValidator, - validator, -) - from opslib.osm.interfaces.kafka import KafkaClient +from opslib.osm.interfaces.keystone import KeystoneClient from opslib.osm.interfaces.mongo import MongoClient from opslib.osm.interfaces.prometheus import PrometheusClient -from opslib.osm.interfaces.keystone import KeystoneClient +from opslib.osm.pod import ContainerV3Builder, PodSpecV3Builder +from opslib.osm.validator import ModelValidator, validator logger = logging.getLogger(__name__) @@ -55,7 +46,7 @@ class ConfigModel(ModelValidator): keystone_enabled: bool vca_host: str vca_user: str - vca_password: str + vca_secret: str vca_cacert: str database_commonkey: str log_level: str @@ -146,7 +137,7 @@ class MonCharm(CharmedOsmBase): # VCA configuration "OSMMON_VCA_HOST": config.vca_host, "OSMMON_VCA_USER": config.vca_user, - "OSMMON_VCA_SECRET": config.vca_password, + "OSMMON_VCA_SECRET": config.vca_secret, "OSMMON_VCA_CACERT": config.vca_cacert, "OSMMON_GRAFANA_URL": config.grafana_url, "OSMMON_GRAFANA_USER": config.grafana_user,