=== modified file 'environs/ec2/ec2.go' --- environs/ec2/ec2.go 2013-03-21 04:04:27 +0000 +++ environs/ec2/ec2.go 2013-03-25 17:54:17 +0000 @@ -244,6 +244,7 @@ flags := environs.HighestVersion | environs.CompatVersion v := version.Current v.Series = env.Config().DefaultSeries() + v.Arch = "amd64" // TODO: set Arch based on constraints (when they are landed) return environs.FindTools(env, v, flags) } @@ -286,7 +287,7 @@ } v := version.Current v.Series = tools.Series - v.Arch = tools.Arch + v.Arch = "amd64" mongoURL := environs.MongoURL(e, v) inst, err := e.startInstance(&startInstanceParams{ machineId: "0", @@ -449,7 +450,7 @@ spec, err := findInstanceSpec(&instanceConstraint{ region: e.ecfg().region(), series: scfg.series, - arches: []string{scfg.tools.Arch}, + arches: []string{scfg.tools.Arch, "amd64"}, constraints: scfg.constraints, }) if err != nil {
=== modified file 'environs/ ec2/ec2. go' HighestVersion | environs. CompatVersion ).DefaultSeries () FindTools( env, v, flags) MongoURL( e, v) (&startInstance Params{
machineId: "0", c(&instanceCons traint{
region: e.ecfg().region(),
series: scfg.series, scfg.tools. Arch}, scfg.tools. Arch, "amd64"},
constraints: scfg.constraints,
--- environs/ec2/ec2.go 2013-03-21 04:04:27 +0000
+++ environs/ec2/ec2.go 2013-03-25 17:54:17 +0000
@@ -244,6 +244,7 @@
flags := environs.
v := version.Current
v.Series = env.Config(
+ v.Arch = "amd64"
// TODO: set Arch based on constraints (when they are landed)
return environs.
}
@@ -286,7 +287,7 @@
}
v := version.Current
v.Series = tools.Series
- v.Arch = tools.Arch
+ v.Arch = "amd64"
mongoURL := environs.
inst, err := e.startInstance
@@ -449,7 +450,7 @@
spec, err := findInstanceSpe
- arches: []string{
+ arches: []string{
})
if err != nil {