~tribaal/charms/trusty/odl-controller-retry-on-client-call-error/trunk

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/core/unitdata.py

  • Committer: Christopher Glass
  • Date: 2015-08-12 07:20:57 UTC
  • mfrom: (3.2.5 trunk)
  • Revision ID: christopher.glass@canonical.com-20150812072057-g9saflz8sxpst495
MergeĀ ~sdn-charmers/charms/trusty/odl-controller/trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
443
443
        data = hookenv.execution_environment()
444
444
        self.conf = conf_delta = self.kv.delta(data['conf'], 'config')
445
445
        self.rels = rels_delta = self.kv.delta(data['rels'], 'rels')
446
 
        self.kv.set('env', data['env'])
 
446
        self.kv.set('env', dict(data['env']))
447
447
        self.kv.set('unit', data['unit'])
448
448
        self.kv.set('relid', data.get('relid'))
449
449
        return conf_delta, rels_delta