commit c753dc5f89180d11c1049f6398d74a4f99d7acd5
author David Garcia <david.garcia@canonical.com> Wed Mar 17 15:28:47 2021 +0100
committer David Garcia <david.garcia@canonical.com> Wed Mar 17 20:03:04 2021 +0100
tree 7012f63b67ea767d89b074558a46766bf72180ef
parent ad254a9b68b288f49c91b9f72f483f59188f92a1

Fix 1473 and add vca_model_config_* to lcm charm

Changes in all operator charms:
- Optimize deps for tox environments
- Add import-order-style to flake8
- Optimize .jujuignore to reduce the size of charm artifacts
OSM LCM charm:
- Added vca_model_config_* options
Added bundle example for using a bundle
Updated the bundles and pin the new versions in the installer

Change-Id: Ic6591354fa5d1b5f43383215b2f0df13eb28ce67
Signed-off-by: David Garcia <david.garcia@canonical.com>

installers/charm/mon/src/charm.py

diff --git a/installers/charm/mon/src/charm.py b/installers/charm/mon/src/charm.py
index 26dee3f..d0145d4 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 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 @@
     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 @@
                 # 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,