X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Flcm%2Fsrc%2Fcharm.py;h=01ac0bf5c4c94b6115a9653c8c60eec4f07bb03b;hb=refs%2Fchanges%2F27%2F11127%2F2;hp=4e0b4bed4a2c857e72c66b64f450ee4572580d5d;hpb=f5e7f42787e29091128a03339d80838ce4ed8496;p=osm%2Fdevops.git diff --git a/installers/charm/lcm/src/charm.py b/installers/charm/lcm/src/charm.py index 4e0b4bed..01ac0bf5 100755 --- a/installers/charm/lcm/src/charm.py +++ b/installers/charm/lcm/src/charm.py @@ -108,6 +108,9 @@ class ConfigModel(ModelValidator): vca_model_config_test_mode: Optional[bool] vca_model_config_transmit_vendor_metrics: Optional[bool] vca_model_config_update_status_hook_interval: Optional[str] + vca_stablerepourl: Optional[str] + vca_helm_ca_certs: Optional[str] + image_pull_policy: str @validator("log_level") def validate_log_level(cls, v): @@ -121,11 +124,28 @@ class ConfigModel(ModelValidator): raise ValueError("mongodb_uri is not properly formed") return v + @validator("image_pull_policy") + def validate_image_pull_policy(cls, v): + values = { + "always": "Always", + "ifnotpresent": "IfNotPresent", + "never": "Never", + } + v = v.lower() + if v not in values.keys(): + raise ValueError("value must be always, ifnotpresent or never") + return values[v] + class LcmCharm(CharmedOsmBase): def __init__(self, *args) -> NoReturn: - super().__init__(*args, oci_image="image") - + super().__init__( + *args, + oci_image="image", + debug_mode_config_key="debug_mode", + debug_pubkey_config_key="debug_pubkey", + vscode_workspace=VSCODE_WORKSPACE, + ) self.kafka_client = KafkaClient(self, "kafka") self.framework.observe(self.on["kafka"].relation_changed, self.configure_pod) self.framework.observe(self.on["kafka"].relation_broken, self.configure_pod) @@ -165,7 +185,9 @@ class LcmCharm(CharmedOsmBase): pod_spec_builder = PodSpecV3Builder() # Build Container - container_builder = ContainerV3Builder(self.app.name, image_info) + container_builder = ContainerV3Builder( + self.app.name, image_info, config.image_pull_policy + ) container_builder.add_port(name=self.app.name, port=PORT) container_builder.add_envs( { @@ -191,6 +213,8 @@ class LcmCharm(CharmedOsmBase): "OSMLCM_STORAGE_COLLECTION": "files", "OSMLCM_STORAGE_URI": config.mongodb_uri or self.mongodb_client.connection_string, + "OSMLCM_VCA_STABLEREPOURL": config.vca_stablerepourl, + "OSMLCM_VCA_HELM_CA_CERTS": config.vca_helm_ca_certs, } ) if config.vca_host: @@ -225,6 +249,28 @@ class LcmCharm(CharmedOsmBase): return pod_spec_builder.build() +VSCODE_WORKSPACE = { + "folders": [ + {"path": "/usr/lib/python3/dist-packages/osm_lcm"}, + {"path": "/usr/lib/python3/dist-packages/osm_n2vc"}, + {"path": "/usr/lib/python3/dist-packages/osm_common"}, + ], + "settings": {}, + "launch": { + "version": "0.2.0", + "configurations": [ + { + "name": "LCM", + "type": "python", + "request": "launch", + "module": "osm_lcm.lcm", + "justMyCode": False, + } + ], + }, +} + + if __name__ == "__main__": main(LcmCharm)