Created
March 12, 2015 16:05
-
-
Save adam-stokes/c116eb37109f2d858684 to your computer and use it in GitHub Desktop.
ignore contrib
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/cloudinstall/placement/controller.py b/cloudinstall/placement/controller.py | |
index 939d1a7..805a7e9 100644 | |
--- a/cloudinstall/placement/controller.py | |
+++ b/cloudinstall/placement/controller.py | |
@@ -167,7 +167,8 @@ class PlacementController: | |
def charm_classes(self): | |
cl = [m.__charm_class__ for m in | |
load_charms(self.config.getopt('charm_plugin_dir')) | |
- if not m.__charm_class__.disabled] | |
+ if not m.__charm_class__.disabled and not | |
+ m.__charm_class__.contrib] | |
return cl | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment