projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding manual external DB URI config
[osm/devops.git]
/
installers
/
charm
/
lcm
/
src
/
charm.py
diff --git
a/installers/charm/lcm/src/charm.py
b/installers/charm/lcm/src/charm.py
index
e9552fd
..
52bc5cf
100755
(executable)
--- a/
installers/charm/lcm/src/charm.py
+++ b/
installers/charm/lcm/src/charm.py
@@
-51,6
+51,7
@@
class ConfigModel(ModelValidator):
vca_cloud: str
vca_k8s_cloud: str
database_commonkey: str
vca_cloud: str
vca_k8s_cloud: str
database_commonkey: str
+ mongodb_uri: Optional[str]
log_level: str
vca_apiproxy: Optional[str]
# Model-config options
log_level: str
vca_apiproxy: Optional[str]
# Model-config options
@@
-114,6
+115,12
@@
class ConfigModel(ModelValidator):
raise ValueError("value must be INFO or DEBUG")
return v
raise ValueError("value must be INFO or DEBUG")
return v
+ @validator("mongodb_uri")
+ def validate_mongodb_uri(cls, v):
+ if v and not v.startswith("mongodb://"):
+ raise ValueError("mongodb_uri is not properly formed")
+ return v
+
class LcmCharm(CharmedOsmBase):
def __init__(self, *args) -> NoReturn:
class LcmCharm(CharmedOsmBase):
def __init__(self, *args) -> NoReturn:
@@
-136,7
+143,7
@@
class LcmCharm(CharmedOsmBase):
if self.kafka_client.is_missing_data_in_unit():
missing_relations.append("kafka")
if self.kafka_client.is_missing_data_in_unit():
missing_relations.append("kafka")
- if self.mongodb_client.is_missing_data_in_unit():
+ if
not config.mongodb_uri and
self.mongodb_client.is_missing_data_in_unit():
missing_relations.append("mongodb")
if self.ro_client.is_missing_data_in_app():
missing_relations.append("ro")
missing_relations.append("mongodb")
if self.ro_client.is_missing_data_in_app():
missing_relations.append("ro")
@@
-147,10
+154,16
@@
class LcmCharm(CharmedOsmBase):
def build_pod_spec(self, image_info):
# Validate config
config = ConfigModel(**dict(self.config))
def build_pod_spec(self, image_info):
# Validate config
config = ConfigModel(**dict(self.config))
+
+ if config.mongodb_uri and not self.mongodb_client.is_missing_data_in_unit():
+ raise Exception("Mongodb data cannot be provided via config and relation")
+
# Check relations
self._check_missing_dependencies(config)
# Check relations
self._check_missing_dependencies(config)
+
# Create Builder for the PodSpec
pod_spec_builder = PodSpecV3Builder()
# Create Builder for the PodSpec
pod_spec_builder = PodSpecV3Builder()
+
# Build Container
container_builder = ContainerV3Builder(self.app.name, image_info)
container_builder.add_port(name=self.app.name, port=PORT)
# Build Container
container_builder = ContainerV3Builder(self.app.name, image_info)
container_builder.add_port(name=self.app.name, port=PORT)
@@
-169,7
+182,8
@@
class LcmCharm(CharmedOsmBase):
"OSMLCM_MESSAGE_PORT": self.kafka_client.port,
# Database configuration
"OSMLCM_DATABASE_DRIVER": "mongo",
"OSMLCM_MESSAGE_PORT": self.kafka_client.port,
# Database configuration
"OSMLCM_DATABASE_DRIVER": "mongo",
- "OSMLCM_DATABASE_URI": self.mongodb_client.connection_string,
+ "OSMLCM_DATABASE_URI": config.mongodb_uri
+ or self.mongodb_client.connection_string,
"OSMLCM_DATABASE_COMMONKEY": config.database_commonkey,
# Storage configuration
"OSMLCM_STORAGE_DRIVER": "mongo",
"OSMLCM_DATABASE_COMMONKEY": config.database_commonkey,
# Storage configuration
"OSMLCM_STORAGE_DRIVER": "mongo",
@@
-195,11
+209,15
@@
class LcmCharm(CharmedOsmBase):
for k, v in self.config.items()
if k.startswith("vca_model_config")
}
for k, v in self.config.items()
if k.startswith("vca_model_config")
}
+
if model_config_envs:
container_builder.add_envs(model_config_envs)
if model_config_envs:
container_builder.add_envs(model_config_envs)
+
container = container_builder.build()
container = container_builder.build()
+
# Add container to pod spec
pod_spec_builder.add_container(container)
# Add container to pod spec
pod_spec_builder.add_container(container)
+
return pod_spec_builder.build()
return pod_spec_builder.build()