launchpad-reviewers team mailing list archive

[Raphaël Badin <raphael.badin@xxxxxxxxxxxxx>]

Raphaël Badin has proposed merging lp:~rvb/juju-core/providers-import-fwreade-1 into lp:~maas-maintainers/juju-core/maas-provider-skeleton.

Commit message:
Register all the providers once.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~rvb/juju-core/providers-import-fwreade-1/+merge/158369

fwreade #1:

«Consider adding an environs/all package, that registers all providers except the dummy.»
-- 
https://code.launchpad.net/~rvb/juju-core/providers-import-fwreade-1/+merge/158369
Your team MAAS Maintainers is requested to review the proposed merge of lp:~rvb/juju-core/providers-import-fwreade-1 into lp:~maas-maintainers/juju-core/maas-provider-skeleton.

=== modified file 'cmd/builddb/main.go'
--- cmd/builddb/main.go	2013-04-04 07:11:39 +0000
+++ cmd/builddb/main.go	2013-04-11 14:02:20 +0000
@@ -11,11 +11,11 @@
 	"os"
 	"path/filepath"
 	"time"
+)
 
-	// Register the provider
-	_ "launchpad.net/juju-core/environs/ec2"
-	_ "launchpad.net/juju-core/environs/maas"
-	_ "launchpad.net/juju-core/environs/openstack"
+// Register the providers.
+import (
+	_ "launchpad.net/juju-core/environs/all"
 )
 
 func main() {

=== modified file 'cmd/juju/main.go'
--- cmd/juju/main.go	2013-04-11 08:01:25 +0000
+++ cmd/juju/main.go	2013-04-11 14:02:20 +0000
@@ -7,13 +7,9 @@
 	"os"
 )
 
-// When we import an environment provider implementation
-// here, it will register itself with environs, and hence
-// be available to the juju command.
+// Register the providers.
 import (
-	_ "launchpad.net/juju-core/environs/ec2"
-	_ "launchpad.net/juju-core/environs/maas"
-	_ "launchpad.net/juju-core/environs/openstack"
+	_ "launchpad.net/juju-core/environs/all"
 )
 
 var jujuDoc = `

=== modified file 'cmd/jujud/main.go'
--- cmd/jujud/main.go	2013-04-08 01:07:16 +0000
+++ cmd/jujud/main.go	2013-04-11 14:02:20 +0000
@@ -9,12 +9,9 @@
 	"path/filepath"
 )
 
-// When we import an environment provider implementation
-// here, it will register itself with environs.
+// Register the providers.
 import (
-	_ "launchpad.net/juju-core/environs/ec2"
-	_ "launchpad.net/juju-core/environs/maas"
-	_ "launchpad.net/juju-core/environs/openstack"
+	_ "launchpad.net/juju-core/environs/all"
 )
 
 var jujudDoc = `

=== added directory 'environs/all'
=== added file 'environs/all/all.go'
--- environs/all/all.go	1970-01-01 00:00:00 +0000
+++ environs/all/all.go	2013-04-11 14:02:20 +0000
@@ -0,0 +1,10 @@
+package all
+
+// Register all the available providers.
+// When we import an environment provider implementation
+// here, it will register itself with environs.
+import (
+	_ "launchpad.net/juju-core/environs/ec2"
+	_ "launchpad.net/juju-core/environs/maas"
+	_ "launchpad.net/juju-core/environs/openstack"
+)