← Back to branch summary

~ubuntu-branches/ubuntu/vivid/heat/vivid

« back to all changes in this revision

Viewing changes to contrib/heat_barbican/heat_barbican/resources/secret.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Corey Bryant
  • Date: 2015-01-06 08:55:22 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20150106085522-4o3hnaff5lacvtrf
Tags: 2015.1~b1-0ubuntu1
[ Chuck Short ]
* Open up for vivid.
* debian/control: Update bzr branch. 
* debian/control: Add python-saharaclient,
  python-osprofiler, python-oslo.middleware, python-oslo.serialization.
* debian/patches/fix-reqirements.patch: Refreshed.
* debian/patches/skip-tests.patch: Updated to skip more tests.
* debian/rules: Skip integration tests.

[ Corey Bryant ]
* New upstream release.
  - d/control: Align requirements with upstream.
  - d/watch: Update uversionmangle for kilo beta naming.
  - d/rules: Generate heat.conf.sample and apply patch before copy.
  - d/rules: Run base tests instead of integration tests.
  - d/p/fix-requirements.patch: Refreshed.
  - d/p/remove-gettextutils-import.patch: Cherry picked from master.
* d/control: Bumped Standards-Version to 3.9.6.

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/heat_barbican/heat_barbican/resources/secret.py
14
14
import six
15
15
 
16
16
from heat.common import exception
 
17
from heat.common.i18n import _
17
18
from heat.engine import attributes
18
19
from heat.engine import clients
19
20
from heat.engine import constraints
125
126
 
126
127
    def handle_create(self):
127
128
        info = dict(self.properties)
128
 
        secret = self.barbican().secrets.Secret(**info)
 
129
        secret = self.barbican().secrets.create(**info)
129
130
        secret_ref = secret.store()
130
131
        self.resource_id_set(secret_ref)
131
132
        return secret_ref
144
145
                raise
145
146
 
146
147
    def _resolve_attribute(self, name):
147
 
        secret = self.barbican().secrets.Secret(self.resource_id)
 
148
        secret = self.barbican().secrets.get(self.resource_id)
148
149
 
149
150
        if name == self.DECRYPTED_PAYLOAD:
150
151
            return secret.payload