launchpad-reviewers team mailing list archive

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

Raphaël Badin has proposed merging lp:~rvb/juju-core/add-imports2 into lp:~maas-maintainers/juju-core/maas-provider-skeleton.

Commit message:
Import the MAAS provider along with the other providers.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~rvb/juju-core/add-imports2/+merge/155669

The change to cmd/jujud/machine.go is definitely required (this broke during testing);  I also added the line in cmd/builddb/main.go to import the MAAS provider along with the other providers even if I'm not sure if it's requiredd.  Anyway, I expect this to be refactored as some point so that one would only need to register a provider once.
-- 
https://code.launchpad.net/~rvb/juju-core/add-imports2/+merge/155669
Your team MAAS Maintainers is requested to review the proposed merge of lp:~rvb/juju-core/add-imports2 into lp:~maas-maintainers/juju-core/maas-provider-skeleton.

=== modified file 'cmd/builddb/main.go'
--- cmd/builddb/main.go	2013-03-01 04:36:01 +0000
+++ cmd/builddb/main.go	2013-03-27 07:25:25 +0000
@@ -14,6 +14,7 @@
 
 	// Register the provider
 	_ "launchpad.net/juju-core/environs/ec2"
+	_ "launchpad.net/juju-core/environs/maas"
 	_ "launchpad.net/juju-core/environs/openstack"
 )
 

=== modified file 'cmd/jujud/machine.go'
--- cmd/jujud/machine.go	2013-03-01 04:36:01 +0000
+++ cmd/jujud/machine.go	2013-03-27 07:25:25 +0000
@@ -6,6 +6,7 @@
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/environs/agent"
 	_ "launchpad.net/juju-core/environs/ec2"
+	_ "launchpad.net/juju-core/environs/maas"
 	_ "launchpad.net/juju-core/environs/openstack"
 	"launchpad.net/juju-core/log"
 	"launchpad.net/juju-core/state"