X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fosm-mon%2Fsrc%2Fcharm.py;h=ff111d69e9dfcc18529977a181671ff78e39b91c;hb=refs%2Fchanges%2F89%2F12589%2F1;hp=045fd981856726b4938a62a0205fe6db370c587a;hpb=190380573f6ba799d51a0e6b6a58ecf35c963228;p=osm%2Fdevops.git diff --git a/installers/charm/osm-mon/src/charm.py b/installers/charm/osm-mon/src/charm.py index 045fd981..ff111d69 100755 --- a/installers/charm/osm-mon/src/charm.py +++ b/installers/charm/osm-mon/src/charm.py @@ -239,10 +239,20 @@ class OsmMonCharm(CharmBase): "OSMMON_DATABASE_COMMONKEY": self.config["database-commonkey"], # Prometheus/grafana configuration "OSMMON_PROMETHEUS_URL": f"http://{self.prometheus_client.hostname}:{self.prometheus_client.port}", + "OSMMON_PROMETHEUS_USER": self.prometheus_client.user + "OSMMON_PROMETHEUS_PASSWORD": self.prometheus_client.password, "OSMMON_GRAFANA_URL": self.config["grafana-url"], "OSMMON_GRAFANA_USER": self.config["grafana-user"], "OSMMON_GRAFANA_PASSWORD": self.config["grafana-password"], + "OSMMON_KEYSTONE_ENABLED": self.config["keystone-enabled"], + "OSMMON_KEYSTONE_URL": self.keystone_client.host, + "OSMMON_KEYSTONE_DOMAIN_NAME": self.keystone_client.user_domain_name, + "OSMMON_KEYSTONE_SERVICE_PROJECT": self.keystone_client.service, + "OSMMON_KEYSTONE_SERVICE_USER": self.keystone_client.username , + "OSMMON_KEYSTONE_SERVICE_PASSWORD": self.keystone_client.password, + "OSMMON_KEYSTONE_SERVICE_PROJECT_DOMAIN_NAME": self.keystone_client.project_domain_name, } + logger.info(f"{environment}") if self.vca.data: environment["OSMMON_VCA_HOST"] = self.vca.data.endpoints environment["OSMMON_VCA_SECRET"] = self.vca.data.secret