Skip to content

Commit 18b2325

Browse files
Luís Simascderici
authored andcommitted
fix parsing of storage constraints
Parses the storage constraints when deploying applications. Before this change the storage constraints where not parsing, resulting in an error when deploying bundles that contained applications with storage definitions.
1 parent 77f02b2 commit 18b2325

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

juju/model.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from .client import client, connector
3030
from .client.overrides import Caveat, Macaroon
3131
from .constraints import parse as parse_constraints
32+
from .constraints import parse_storage_constraint
3233
from .controller import Controller, ConnectedController
3334
from .delta import get_entity_class, get_entity_delta
3435
from .errors import JujuAPIError, JujuError, JujuModelConfigError, JujuBackupError
@@ -2115,7 +2116,7 @@ async def _deploy(self, charm_url, application, series, config,
21152116
devices=devices,
21162117
dryrun=False,
21172118
placement=placement,
2118-
storage=storage,
2119+
storage={k: parse_storage_constraint(v) for k, v in (storage or dict()).items()},
21192120
trust=trust,
21202121
base=charm_origin.base,
21212122
channel=channel,
@@ -2150,7 +2151,7 @@ async def _deploy(self, charm_url, application, series, config,
21502151
endpoint_bindings=endpoint_bindings,
21512152
num_units=num_units,
21522153
resources=resources,
2153-
storage=storage,
2154+
storage={k: parse_storage_constraint(v) for k, v in (storage or dict()).items()},
21542155
placement=placement,
21552156
devices=devices,
21562157
attach_storage=attach_storage,

0 commit comments

Comments
 (0)