X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=installers%2Fcharm%2Fkeystone%2Fsrc%2Fcharm.py;h=4e04e88ae35b4d97c90f2026b45b7441abb1ea1b;hb=3ddbbd1f6c70306d13db0976e1e6b3bda0c69abd;hp=1dd0ba58f316143ba8558e0a62ef4a820ef1f0a9;hpb=d68e0b4f0bc482d61f2e2a775b899237e15f93e9;p=osm%2Fdevops.git diff --git a/installers/charm/keystone/src/charm.py b/installers/charm/keystone/src/charm.py index 1dd0ba58..4e04e88a 100755 --- a/installers/charm/keystone/src/charm.py +++ b/installers/charm/keystone/src/charm.py @@ -84,6 +84,7 @@ class ConfigModel(ModelValidator): mysql_host: Optional[str] mysql_port: Optional[int] mysql_root_password: Optional[str] + image_pull_policy: Optional[str] @validator("max_file_size") def validate_max_file_size(cls, v): @@ -111,6 +112,18 @@ class ConfigModel(ModelValidator): raise ValueError("Mysql port out of range") 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 ConfigLdapModel(ModelValidator): ldap_enabled: bool @@ -261,7 +274,9 @@ class KeystoneCharm(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) # Build files