summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-03-09 19:45:56 +0000
committerGerrit Code Review <review@openstack.org>2015-03-09 19:45:56 +0000
commit36c38bfd00937fe911fad336a2155132e401fc98 (patch)
treef97cf00d3d4c9233fc4246c3f495e93e1963a08b
parentd292d75f076fc5702fa5cd49e7b7024d0412bd6b (diff)
parent49273f7a89c5d97668bcce1df1b0dc8c17bfae1d (diff)
downloadpython-barbicanclient-36c38bfd00937fe911fad336a2155132e401fc98.tar.gz
Merge "Pass correct api object to Container constructor"
-rw-r--r--barbicanclient/barbican_cli/containers.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/barbicanclient/barbican_cli/containers.py b/barbicanclient/barbican_cli/containers.py
index 1ad14a0..91efb66 100644
--- a/barbicanclient/barbican_cli/containers.py
+++ b/barbicanclient/barbican_cli/containers.py
@@ -103,7 +103,7 @@ class CreateContainer(show.ShowOne):
private_key_ref = secret_refs.get('private_key')
private_key_pass_ref = secret_refs.get('private_key_passphrase')
entity = RSAContainer(
- api=self.app.client,
+ api=self.app.client.containers._api,
name=args.name,
public_key_ref=public_key_ref,
private_key_ref=private_key_ref,
@@ -115,7 +115,7 @@ class CreateContainer(show.ShowOne):
private_key_ref = secret_refs.get('private_key')
private_key_pass_ref = secret_refs.get('private_key_passphrase')
entity = CertificateContainer(
- api=self.app.client,
+ api=self.app.client.containers._api,
name=args.name,
certificate_ref=certificate_ref,
intermediates_ref=intermediates_ref,
@@ -123,8 +123,8 @@ class CreateContainer(show.ShowOne):
private_key_passphrase_ref=private_key_pass_ref,
)
else:
- entity = container_type(api=self.app.client, name=args.name,
- secret_refs=secret_refs)
+ entity = container_type(api=self.app.client.containers._api,
+ name=args.name, secret_refs=secret_refs)
entity.store()
return entity._get_formatted_entity()