← Back to branch summary

~openstack-charmers-next/charms/wily/nova-cloud-controller/trunk

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/storage/linux/ceph.py

  • Committer: James Page
  • Date: 2016-06-17 10:52:35 UTC
  • Revision ID: james.page@ubuntu.com-20160617105235-vs2clgt11766yyjv
Switch to using charm-store for amulet tests

All OpenStack charms are now directly published to the charm store
on landing; switch Amulet helper to resolve charms using the
charm store rather than bzr branches, removing the lag between
charm changes landing and being available for other charms to
use for testing.

This is also important for new layered charms where the charm must
be build and published prior to being consumable.

Change-Id: Ia4cbe14575851c0f54cbb5845ffd6b8669fb7fa2

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/storage/linux/ceph.py
1231
1231
 
1232
1232
        permitted = self.permitted_sections
1233
1233
        if permitted:
1234
 
            diff = set(conf.keys()).symmetric_difference(set(permitted))
 
1234
            diff = set(conf.keys()).difference(set(permitted))
1235
1235
            if diff:
1236
1236
                log("Config-flags contains invalid keys '%s' - they will be "
1237
1237
                    "ignored" % (', '.join(diff)), level=WARNING)