Merge lp:~gz/juju-core/openstack_network_config_1241674 into lp:~go-bot/juju-core/trunk

[Martin Packman]

provider/openstack: Add network config option

Resolve issue with running juju on openstack setups with
multiple networks, by allowing the user to supply a
network label or id that juju should use for its machines.

https://codereview.appspot.com/52710048/

R=natefinch

provider/openstack: Add network config option

Resolve issue with running juju on openstack setups with
multiple networks, by allowing the user to supply a
network label or id that juju should use for its machines.

https://codereview.appspot.com/52710048/

[Martin Packman (gz)]

Reviewers: mp+203114_code.launchpad.net,

Message:
Please take a look.

Description:
provider/openstack: Add network config option

Resolve issue with running juju on openstack setups with
multiple networks, by allowing the user to supply a
network label or id that juju should use for its machines.

Note: this still requires a dependencies.tsv goose bump

https://code.launchpad.net/~gz/juju-core/openstack_network_config_1241674/+merge/203114

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/52710048/

Affected files (+146, -8 lines):
   A [revision details]
   M provider/openstack/config.go
   M provider/openstack/config_test.go
   M provider/openstack/export_test.go
   M provider/openstack/local_test.go
   M provider/openstack/provider.go

[William Reade (fwereade)]

quick comments -- thoughts?

https://codereview.appspot.com/52710048/diff/1/provider/openstack/config.go
File provider/openstack/config.go (right):

https://codereview.appspot.com/52710048/diff/1/provider/openstack/config.go#newcode42
provider/openstack/config.go:42: "network": "",
this feels like maybe it should be an Omit?

https://codereview.appspot.com/52710048/diff/1/provider/openstack/config.go#newcode95
provider/openstack/config.go:95: return c.attrs["network"].(string)
and this a `,ok`?

https://codereview.appspot.com/52710048/diff/1/provider/openstack/local_test.go
File provider/openstack/local_test.go (right):

https://codereview.appspot.com/52710048/diff/1/provider/openstack/local_test.go#newcode364
provider/openstack/local_test.go:364: "network":
"f81d4fae-7dec-11d0-a765-00a0c91e6bf6",
a thought: default-network? private-network?

https://codereview.appspot.com/52710048/diff/1/provider/openstack/local_test.go#newcode371
provider/openstack/local_test.go:371: c.Assert(err, gc.ErrorMatches,
"(?s)cannot run instance: .*itemNotFound.*")
I'd like to see a more precise error check here really.

https://codereview.appspot.com/52710048/

[Martin Packman (gz)]

Please take a look.

https://codereview.appspot.com/52710048/diff/1/provider/openstack/local_test.go
File provider/openstack/local_test.go (right):

https://codereview.appspot.com/52710048/diff/1/provider/openstack/local_test.go#newcode364
provider/openstack/local_test.go:364: "network":
"f81d4fae-7dec-11d0-a765-00a0c91e6bf6",
On 2014/01/24 16:53:49, fwereade wrote:
> a thought: default-network? private-network?

Yeah, config named 'network' is bad, but I think config for this at all
is bad. And it should take multiple values. I am resolved to leave some
bikeshedding for post 1.17.1 over this. :)

https://codereview.appspot.com/52710048/diff/1/provider/openstack/local_test.go#newcode371
provider/openstack/local_test.go:371: c.Assert(err, gc.ErrorMatches,
"(?s)cannot run instance: .*itemNotFound.*")
On 2014/01/24 16:53:49, fwereade wrote:
> I'd like to see a more precise error check here really.

Sadly our errors through goose are massively verbose, and the real
errors from (older at least) openstack versions are actually this
impresice. It might be an argument for doing more prechecking even when
a valid uuid is supplied.

https://codereview.appspot.com/52710048/

[Martin Packman (gz)]

Please take a look.

https://codereview.appspot.com/52710048/diff/1/provider/openstack/local_test.go
File provider/openstack/local_test.go (right):

https://codereview.appspot.com/52710048/diff/1/provider/openstack/local_test.go#newcode364
provider/openstack/local_test.go:364: "network":
"f81d4fae-7dec-11d0-a765-00a0c91e6bf6",
On 2014/01/24 16:53:49, fwereade wrote:
> a thought: default-network? private-network?

Yeah, config named 'network' is bad, but I think config for this at all
is bad. And it should take multiple values. I am resolved to leave some
bikeshedding for post 1.17.1 over this. :)

https://codereview.appspot.com/52710048/diff/1/provider/openstack/local_test.go#newcode371
provider/openstack/local_test.go:371: c.Assert(err, gc.ErrorMatches,
"(?s)cannot run instance: .*itemNotFound.*")
On 2014/01/24 16:53:49, fwereade wrote:
> I'd like to see a more precise error check here really.

Sadly our errors through goose are massively verbose, and the real
errors from (older at least) openstack versions are actually this
impresice. It might be an argument for doing more prechecking even when
a valid uuid is supplied.

https://codereview.appspot.com/52710048/

[Nate Finch (natefinch)]

LGTM with a couple small points.

https://codereview.appspot.com/52710048/diff/20001/provider/openstack/provider.go
File provider/openstack/provider.go (right):

https://codereview.appspot.com/52710048/diff/20001/provider/openstack/provider.go#newcode79
provider/openstack/provider.go:79: # networks specifies the network
label or uuid to bring machines up on, in
s/networks/network

https://codereview.appspot.com/52710048/diff/20001/provider/openstack/provider.go#newcode642
provider/openstack/provider.go:642: var uuidRegexp =
regexp.MustCompile(uuidPattern)
Seems like there ought to be a function that verifies guids in Go
instead of hand-writing a regex...

https://codereview.appspot.com/52710048/

[Nate Finch (natefinch)]

LGTM with a couple small points.

https://codereview.appspot.com/52710048/diff/20001/provider/openstack/provider.go
File provider/openstack/provider.go (right):

https://codereview.appspot.com/52710048/diff/20001/provider/openstack/provider.go#newcode79
provider/openstack/provider.go:79: # networks specifies the network
label or uuid to bring machines up on, in
s/networks/network

https://codereview.appspot.com/52710048/diff/20001/provider/openstack/provider.go#newcode642
provider/openstack/provider.go:642: var uuidRegexp =
regexp.MustCompile(uuidPattern)
Seems like there ought to be a function that verifies guids in Go
instead of hand-writing a regex...

https://codereview.appspot.com/52710048/

[Martin Packman (gz)]

Please take a look.

https://codereview.appspot.com/52710048/diff/20001/provider/openstack/provider.go
File provider/openstack/provider.go (right):

https://codereview.appspot.com/52710048/diff/20001/provider/openstack/provider.go#newcode79
provider/openstack/provider.go:79: # networks specifies the network
label or uuid to bring machines up on, in
On 2014/01/24 20:12:45, nate.finch wrote:
> s/networks/network

Will fix... I did plan to allow supplying multiple initially, but we'll
leave that for later.

https://codereview.appspot.com/52710048/diff/20001/provider/openstack/provider.go#newcode642
provider/openstack/provider.go:642: var uuidRegexp =
regexp.MustCompile(uuidPattern)
On 2014/01/24 20:12:45, nate.finch wrote:
> Seems like there ought to be a function that verifies guids in Go
instead of
> hand-writing a regex...

Yes, yes there should. The best I could find was:

<https://github.com/nu7hatch/gouuid/blob/master/uuid.go>

https://codereview.appspot.com/52710048/

[Go Bot (go-bot)]

The attempt to merge lp:~gz/juju-core/openstack_network_config_1241674 into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 1.372s
ok launchpad.net/juju-core/agent/tools 0.281s
ok launchpad.net/juju-core/bzr 8.517s
ok launchpad.net/juju-core/cert 3.220s
ok launchpad.net/juju-core/charm 0.685s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.034s
ok launchpad.net/juju-core/cloudinit/sshinit 1.075s
ok launchpad.net/juju-core/cmd 0.276s
ok launchpad.net/juju-core/cmd/charm-admin 0.869s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 259.043s

----------------------------------------------------------------------
FAIL: machine_test.go:278: MachineSuite.TestManageEnviron

[LOG] 83.93422 DEBUG juju.environs.configstore Making /tmp/gocheck-2202916659517317514/50/home/ubuntu/.juju/environments
[LOG] 84.05088 DEBUG juju.environs.tools reading v1.* tools
[LOG] 84.05098 INFO juju environs/testing: uploading FAKE tools 1.17.1-precise-amd64
[LOG] 84.05221 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 84.05222 DEBUG juju.environs.tools no series specified when finding tools, looking for any
[LOG] 84.05233 DEBUG juju.environs.simplestreams fetchData failed for "http://127.0.0.1:53656/dummyenv/private/tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 84.05236 DEBUG juju.environs.simplestreams cannot load index "http://127.0.0.1:53656/dummyenv/private/tools/streams/v1/index.sjson": invalid URL "http://127.0.0.1:53656/dummyenv/private/tools/streams/v1/index.sjson" not found
[LOG] 84.05240 DEBUG juju.environs.simplestreams fetchData failed for "http://127.0.0.1:53656/dummyenv/private/tools/streams/v1/index.json": file "tools/streams/v1/index.json" not found not found
[LOG] 84.05242 DEBUG juju.environs.simplestreams cannot load index "http://127.0.0.1:53656/dummyenv/private/tools/streams/v1/index.json": invalid URL "http://127.0.0.1:53656/dummyenv/private/tools/streams/v1/index.json" not found
[LOG] 84.05287 INFO juju.environs.tools Writing tools/streams/v1/index.json
[LOG] 84.05294 INFO juju.environs.tools Writing tools/streams/v1/com.ubuntu.juju:released:tools.json
[LOG] 84.05313 INFO juju.environs.bootstrap bootstrapping environment "dummyenv"
[LOG] 84.05321 DEBUG juju.environs.bootstrap looking for bootstrap tools: series="precise", arch=<nil>, version=1.17.1
[LOG] 84.05324 INFO juju.environs.tools reading tools with major.minor version 1.17
[LOG] 84.05328 INFO juju.environs.tools filtering tools by version: 1.17.1
[LOG] 84.05328 INFO juju.environs.tools filtering tools by series: precise
[LOG] 84.05331 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 84.05333 DEBUG juju.environs.simplestreams fetchData failed for "http://127.0.0.1:53656/dummyenv/private/tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 84.05...

[Go Bot (go-bot)]

The attempt to merge lp:~gz/juju-core/openstack_network_config_1241674 into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 1.542s
ok launchpad.net/juju-core/agent/tools 0.285s
ok launchpad.net/juju-core/bzr 8.752s
ok launchpad.net/juju-core/cert 3.794s
ok launchpad.net/juju-core/charm 0.619s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.040s
ok launchpad.net/juju-core/cloudinit/sshinit 1.063s
ok launchpad.net/juju-core/cmd 0.224s
ok launchpad.net/juju-core/cmd/charm-admin 0.836s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 232.068s

----------------------------------------------------------------------
FAIL: machine_test.go:329: MachineSuite.TestManageEnvironRunsInstancePoller

[LOG] 51.17876 DEBUG juju.environs.configstore Making /tmp/gocheck-5793183108815074904/64/home/ubuntu/.juju/environments
[LOG] 51.26292 DEBUG juju.environs.tools reading v1.* tools
[LOG] 51.26297 INFO juju environs/testing: uploading FAKE tools 1.17.1-precise-amd64
[LOG] 51.27510 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 51.27512 DEBUG juju.environs.tools no series specified when finding tools, looking for any
[LOG] 51.27519 DEBUG juju.environs.simplestreams fetchData failed for "http://127.0.0.1:40458/dummyenv/private/tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 51.27521 DEBUG juju.environs.simplestreams cannot load index "http://127.0.0.1:40458/dummyenv/private/tools/streams/v1/index.sjson": invalid URL "http://127.0.0.1:40458/dummyenv/private/tools/streams/v1/index.sjson" not found
[LOG] 51.27525 DEBUG juju.environs.simplestreams fetchData failed for "http://127.0.0.1:40458/dummyenv/private/tools/streams/v1/index.json": file "tools/streams/v1/index.json" not found not found
[LOG] 51.27527 DEBUG juju.environs.simplestreams cannot load index "http://127.0.0.1:40458/dummyenv/private/tools/streams/v1/index.json": invalid URL "http://127.0.0.1:40458/dummyenv/private/tools/streams/v1/index.json" not found
[LOG] 51.27555 INFO juju.environs.tools Writing tools/streams/v1/index.json
[LOG] 51.27564 INFO juju.environs.tools Writing tools/streams/v1/com.ubuntu.juju:released:tools.json
[LOG] 51.27579 INFO juju.environs.bootstrap bootstrapping environment "dummyenv"
[LOG] 51.27585 DEBUG juju.environs.bootstrap looking for bootstrap tools: series="precise", arch=<nil>, version=1.17.1
[LOG] 51.27586 INFO juju.environs.tools reading tools with major.minor version 1.17
[LOG] 51.27588 INFO juju.environs.tools filtering tools by version: 1.17.1
[LOG] 51.27588 INFO juju.environs.tools filtering tools by series: precise
[LOG] 51.27590 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 51.27594 DEBUG juju.environs.simplestreams fetchData failed for "http://127.0.0.1:40458/dummyenv/private/tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not...

=== modified file 'dependencies.tsv'
--- dependencies.tsv	2014-01-22 01:37:16 +0000
+++ dependencies.tsv	2014-01-24 20:43:20 +0000
@@ -6,7 +6,7 @@
 launchpad.net/gocheck	bzr	[e-mail]-20130302024745-6ikofwq2c03h7giu	85
 launchpad.net/golxc	bzr	[e-mail]-20140116225718-lvoikrb0me6zugin	6
 launchpad.net/gomaasapi	bzr	[e-mail]-20131017011445-m1hmr0ap14osd7li	47
-launchpad.net/goose	bzr	tarmac-20131223000240-y2igxjt3kznam7vi	114
+launchpad.net/goose	bzr	tarmac-20140124165235-h9rloooc531udms5	116
 launchpad.net/goyaml	bzr	[e-mail]-20131114120802-abe042syx64z2m7s	50
 launchpad.net/gwacl	bzr	tarmac-20131031081035-b33m6fyrrdiuf408	229
 launchpad.net/loggo	bzr	[e-mail]-20130729043644-ym0cscir1cist4sm	39

=== modified file 'provider/openstack/config.go'
--- provider/openstack/config.go	2013-12-23 00:46:18 +0000
+++ provider/openstack/config.go	2014-01-24 20:43:20 +0000
@@ -25,6 +25,7 @@
 	"control-bucket":       schema.String(),
 	"use-floating-ip":      schema.Bool(),
 	"use-default-secgroup": schema.Bool(),
+	"network":              schema.String(),
 }
 var configDefaults = schema.Defaults{
 	"username":             "",
@@ -38,6 +39,7 @@
 	"control-bucket":       "",
 	"use-floating-ip":      false,
 	"use-default-secgroup": false,
+	"network":              "",
 }
 
 type environConfig struct {
@@ -89,6 +91,10 @@
 	return c.attrs["use-default-secgroup"].(bool)
 }
 
+func (c *environConfig) network() string {
+	return c.attrs["network"].(string)
+}
+
 func (p environProvider) newConfig(cfg *config.Config) (*environConfig, error) {
 	valid, err := p.Validate(cfg, nil)
 	if err != nil {

=== modified file 'provider/openstack/config_test.go'
--- provider/openstack/config_test.go	2013-12-23 00:46:18 +0000
+++ provider/openstack/config_test.go	2014-01-24 20:43:20 +0000
@@ -58,6 +58,7 @@
 	toolsURL                string
 	useFloatingIP           bool
 	useDefaultSecurityGroup bool
+	network                 string
 	username                string
 	password                string
 	tenantName              string
@@ -161,6 +162,7 @@
 	}
 	c.Assert(ecfg.useFloatingIP(), gc.Equals, t.useFloatingIP)
 	c.Assert(ecfg.useDefaultSecurityGroup(), gc.Equals, t.useDefaultSecurityGroup)
+	c.Assert(ecfg.network(), gc.Equals, t.network)
 	// Default should be true
 	expectedHostnameVerification := true
 	if t.sslHostnameSet {
@@ -430,6 +432,15 @@
 		},
 		sslHostnameVerification: true,
 		sslHostnameSet:          true,
+	}, {
+		summary: "default network",
+		network: "",
+	}, {
+		summary: "network",
+		config: attrs{
+			"network": "a-network-label",
+		},
+		network: "a-network-label",
 	},
 }
 

=== modified file 'provider/openstack/export_test.go'
--- provider/openstack/export_test.go	2013-12-10 04:25:06 +0000
+++ provider/openstack/export_test.go	2014-01-24 20:43:20 +0000
@@ -311,3 +311,8 @@
 func GetNovaClient(e environs.Environ) *nova.Client {
 	return e.(*environ).nova()
 }
+
+// ResolveNetwork exposes environ helper function resolveNetwork for testing
+func ResolveNetwork(e environs.Environ, networkName string) (string, error) {
+	return e.(*environ).resolveNetwork(networkName)
+}

=== modified file 'provider/openstack/local_test.go'
--- provider/openstack/local_test.go	2013-12-20 02:38:56 +0000
+++ provider/openstack/local_test.go	2014-01-24 20:43:20 +0000
@@ -332,6 +332,48 @@
 	c.Assert(hc.CpuPower, gc.IsNil)
 }
 
+func (s *localServerSuite) TestStartInstanceNetwork(c *gc.C) {
+	cfg, err := config.New(config.NoDefaults, s.TestConfig.Merge(coretesting.Attrs{
+		// A label that corresponds to a nova test service network
+		"network": "net",
+	}))
+	c.Assert(err, gc.IsNil)
+	env, err := environs.New(cfg)
+	c.Assert(err, gc.IsNil)
+	inst, _ := testing.AssertStartInstance(c, env, "100")
+	err = env.StopInstances([]instance.Instance{inst})
+	c.Assert(err, gc.IsNil)
+}
+
+func (s *localServerSuite) TestStartInstanceNetworkUnknownLabel(c *gc.C) {
+	cfg, err := config.New(config.NoDefaults, s.TestConfig.Merge(coretesting.Attrs{
+		// A label that has no related network in the nova test service
+		"network": "no-network-with-this-label",
+	}))
+	c.Assert(err, gc.IsNil)
+	env, err := environs.New(cfg)
+	c.Assert(err, gc.IsNil)
+	inst, _, err := testing.StartInstance(env, "100")
+	c.Check(inst, gc.IsNil)
+	c.Assert(err, gc.ErrorMatches, "No networks exist with label .*")
+}
+
+func (s *localServerSuite) TestStartInstanceNetworkUnknownId(c *gc.C) {
+	cfg, err := config.New(config.NoDefaults, s.TestConfig.Merge(coretesting.Attrs{
+		// A valid UUID but no related network in the nova test service
+		"network": "f81d4fae-7dec-11d0-a765-00a0c91e6bf6",
+	}))
+	c.Assert(err, gc.IsNil)
+	env, err := environs.New(cfg)
+	c.Assert(err, gc.IsNil)
+	inst, _, err := testing.StartInstance(env, "100")
+	c.Check(inst, gc.IsNil)
+	c.Assert(err, gc.ErrorMatches, "cannot run instance: (\\n|.)*"+
+		"caused by: "+
+		"request \\(.*/servers\\) returned unexpected status: "+
+		"404; error info: .*itemNotFound.*")
+}
+
 var instanceGathering = []struct {
 	ids []instance.Id
 	err error
@@ -939,3 +981,31 @@
 	c.Assert(err, gc.IsNil)
 	c.Check(insts, gc.HasLen, 1)
 }
+
+func (s *localServerSuite) TestResolveNetworkUUID(c *gc.C) {
+	env := s.Prepare(c)
+	var sampleUUID = "f81d4fae-7dec-11d0-a765-00a0c91e6bf6"
+	networkId, err := openstack.ResolveNetwork(env, sampleUUID)
+	c.Assert(err, gc.IsNil)
+	c.Assert(networkId, gc.Equals, sampleUUID)
+}
+
+func (s *localServerSuite) TestResolveNetworkLabel(c *gc.C) {
+	env := s.Prepare(c)
+	// For now this test has to cheat and use knowledge of goose internals
+	var networkLabel = "net"
+	var expectNetworkId = "1"
+	networkId, err := openstack.ResolveNetwork(env, networkLabel)
+	c.Assert(err, gc.IsNil)
+	c.Assert(networkId, gc.Equals, expectNetworkId)
+}
+
+func (s *localServerSuite) TestResolveNetworkNotPresent(c *gc.C) {
+	env := s.Prepare(c)
+	var notPresentNetwork = "no-network-with-this-label"
+	networkId, err := openstack.ResolveNetwork(env, notPresentNetwork)
+	c.Check(networkId, gc.Equals, "")
+	c.Assert(err, gc.ErrorMatches, `No networks exist with label "no-network-with-this-label"`)
+}
+
+// TODO(gz): TestResolveNetworkMultipleMatching when can inject new networks

=== modified file 'provider/openstack/provider.go'
--- provider/openstack/provider.go	2014-01-20 17:18:13 +0000
+++ provider/openstack/provider.go	2014-01-24 20:43:20 +0000
@@ -10,6 +10,7 @@
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"regexp"
 	"strings"
 	"sync"
 	"time"
@@ -75,6 +76,10 @@
     # Openstack security group assigned.
     # use-default-secgroup: false
 
+    # network specifies the network label or uuid to bring machines up on, in
+    # the case where multiple networks exist. It may be omitted otherwise.
+    # network: <your network label or uuid>
+
     # tools-metadata-url specifies the location of the Juju tools and metadata. It defaults to the
     # global public tools metadata location https://streams.canonical.com/tools.
     # tools-metadata-url:  https://you-tools-metadata-url
@@ -631,6 +636,37 @@
 	return e.toolsSources, nil
 }
 
+// TODO(gz): Move this somewhere more reusable
+const uuidPattern = "^([a-fA-F0-9]{8})-([a-fA-f0-9]{4})-([1-5][a-fA-f0-9]{3})-([a-fA-f0-9]{4})-([a-fA-f0-9]{12})$"
+
+var uuidRegexp = regexp.MustCompile(uuidPattern)
+
+// resolveNetwork takes either a network id or label and returns a network id
+func (e *environ) resolveNetwork(networkName string) (string, error) {
+	if uuidRegexp.MatchString(networkName) {
+		// Network id supplied, assume valid as boot will fail if not
+		return networkName, nil
+	}
+	// Network label supplied, resolve to a network id
+	networks, err := e.nova().ListNetworks()
+	if err != nil {
+		return "", err
+	}
+	var networkIds = []string{}
+	for _, network := range networks {
+		if network.Label == networkName {
+			networkIds = append(networkIds, network.Id)
+		}
+	}
+	switch len(networkIds) {
+	case 1:
+		return networkIds[0], nil
+	case 0:
+		return "", fmt.Errorf("No networks exist with label %q", networkName)
+	}
+	return "", fmt.Errorf("Multiple networks with label %q: %v", networkName, networkIds)
+}
+
 // allocatePublicIP tries to find an available floating IP address, or
 // allocates a new one, returning it, or an error
 func (e *environ) allocatePublicIP() (*nova.FloatingIP, error) {
@@ -711,6 +747,16 @@
 		return nil, nil, fmt.Errorf("cannot make user data: %v", err)
 	}
 	logger.Debugf("openstack user data; %d bytes", len(userData))
+	var networks = []nova.ServerNetworks{}
+	usingNetwork := e.ecfg().network()
+	if usingNetwork != "" {
+		networkId, err := e.resolveNetwork(usingNetwork)
+		if err != nil {
+			return nil, nil, err
+		}
+		logger.Debugf("using network id %q", networkId)
+		networks = append(networks, nova.ServerNetworks{NetworkId: networkId})
+	}
 	withPublicIP := e.ecfg().useFloatingIP()
 	var publicIP *nova.FloatingIP
 	if withPublicIP {
@@ -730,16 +776,17 @@
 	for i, g := range groups {
 		groupNames[i] = nova.SecurityGroupName{g.Name}
 	}
-
+	var opts = nova.RunServerOpts{
+		Name:               e.machineFullName(machineConfig.MachineId),
+		FlavorId:           spec.InstanceType.Id,
+		ImageId:            spec.Image.Id,
+		UserData:           userData,
+		SecurityGroupNames: groupNames,
+		Networks:           networks,
+	}
 	var server *nova.Entity
 	for a := shortAttempt.Start(); a.Next(); {
-		server, err = e.nova().RunServer(nova.RunServerOpts{
-			Name:               e.machineFullName(machineConfig.MachineId),
-			FlavorId:           spec.InstanceType.Id,
-			ImageId:            spec.Image.Id,
-			UserData:           userData,
-			SecurityGroupNames: groupNames,
-		})
+		server, err = e.nova().RunServer(opts)
 		if err == nil || !gooseerrors.IsNotFound(err) {
 			break
 		}